projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 1754: update keystone dockerfile to ubuntu 20.04
[osm/devops.git]
/
docker
/
RO
/
Dockerfile
diff --git
a/docker/RO/Dockerfile
b/docker/RO/Dockerfile
index
8dbba7e
..
4e7d548
100644
(file)
--- a/
docker/RO/Dockerfile
+++ b/
docker/RO/Dockerfile
@@
-27,7
+27,7
@@
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
curl=7.58.* \
genisoimage=9:1.1.* \
netbase=5.* && \
curl=7.58.* \
genisoimage=9:1.1.* \
netbase=5.* && \
- python3 -m easy_install pip==21.0.1
+ python3 -m easy_install pip==21.0.1
setuptools==51.0.0
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_NG_RO_URL
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_NG_RO_URL
@@
-43,6
+43,7
@@
ARG PYTHON3_OSM_ROSDN_ONOSOF_URL
ARG PYTHON3_OSM_ROSDN_ONOS_VPLS_URL
ARG PYTHON3_OSM_ROVIM_AWS_URL
ARG PYTHON3_OSM_ROVIM_AZURE_URL
ARG PYTHON3_OSM_ROSDN_ONOS_VPLS_URL
ARG PYTHON3_OSM_ROVIM_AWS_URL
ARG PYTHON3_OSM_ROVIM_AZURE_URL
+ARG PYTHON3_OSM_ROVIM_GCP_URL
ARG PYTHON3_OSM_ROVIM_FOS_URL
ARG PYTHON3_OSM_ROVIM_OPENNEBULA_URL
ARG PYTHON3_OSM_ROVIM_OPENSTACK_URL
ARG PYTHON3_OSM_ROVIM_FOS_URL
ARG PYTHON3_OSM_ROVIM_OPENNEBULA_URL
ARG PYTHON3_OSM_ROVIM_OPENSTACK_URL
@@
-64,6
+65,7
@@
RUN for URL in \
$PYTHON3_OSM_ROSDN_ONOS_VPLS_URL \
$PYTHON3_OSM_ROVIM_AWS_URL \
$PYTHON3_OSM_ROVIM_AZURE_URL \
$PYTHON3_OSM_ROSDN_ONOS_VPLS_URL \
$PYTHON3_OSM_ROVIM_AWS_URL \
$PYTHON3_OSM_ROVIM_AZURE_URL \
+ $PYTHON3_OSM_ROVIM_GCP_URL \
$PYTHON3_OSM_ROVIM_FOS_URL \
$PYTHON3_OSM_ROVIM_OPENNEBULA_URL \
$PYTHON3_OSM_ROVIM_OPENSTACK_URL \
$PYTHON3_OSM_ROVIM_FOS_URL \
$PYTHON3_OSM_ROVIM_OPENNEBULA_URL \
$PYTHON3_OSM_ROVIM_OPENSTACK_URL \
@@
-81,7
+83,8
@@
RUN pip3 install \
FROM ubuntu:18.04
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
FROM ubuntu:18.04
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
- DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.*
+ DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.* \
+ && rm -rf /var/lib/apt/lists/*
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages /usr/local/lib/python3.6/dist-packages
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages /usr/local/lib/python3.6/dist-packages