projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 1841: LTS Support
[osm/devops.git]
/
docker
/
RO
/
Dockerfile
diff --git
a/docker/RO/Dockerfile
b/docker/RO/Dockerfile
index
26c148b
..
8402b42
100644
(file)
--- a/
docker/RO/Dockerfile
+++ b/
docker/RO/Dockerfile
@@
-16,19
+16,21
@@
########################################################################
########################################################################
-FROM ubuntu:
18
.04 as INSTALL
+FROM ubuntu:
20
.04 as INSTALL
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- gcc=4:
7.4.0-1ubuntu2.3
\
- python3=3.
6.7-1~18.04
\
- python3-dev=3.
6.7-1~18.04
\
- python3-
setuptools=39.0.1-2
\
-
curl=7.58.0-2ubuntu3.13 &&
\
- python3 -m easy_install pip==21.0.1
+ gcc=4:
9.3.*
\
+ python3=3.
8.*
\
+ python3-dev=3.
8.*
\
+ python3-
pip=20.0.2*
\
+
python3-setuptools=45.2.*
\
+ curl=7.68.*
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- genisoimage=9:1.1.11-3ubuntu2
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+ DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+ genisoimage=9:1.1.* \
+ netbase=6.*
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_NG_RO_URL
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_NG_RO_URL
@@
-44,8
+46,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_FOS_URL
-ARG PYTHON3_OSM_ROVIM_OPENNEBULA_URL
+ARG PYTHON3_OSM_ROVIM_GCP_URL
ARG PYTHON3_OSM_ROVIM_OPENSTACK_URL
ARG PYTHON3_OSM_ROVIM_OPENVIM_URL
ARG PYTHON3_OSM_ROVIM_VMWARE_URL
ARG PYTHON3_OSM_ROVIM_OPENSTACK_URL
ARG PYTHON3_OSM_ROVIM_OPENVIM_URL
ARG PYTHON3_OSM_ROVIM_VMWARE_URL
@@
-65,8
+66,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_FOS_URL \
- $PYTHON3_OSM_ROVIM_OPENNEBULA_URL \
+ $PYTHON3_OSM_ROVIM_GCP_URL \
$PYTHON3_OSM_ROVIM_OPENSTACK_URL \
$PYTHON3_OSM_ROVIM_OPENVIM_URL \
$PYTHON3_OSM_ROVIM_VMWARE_URL ; do \
$PYTHON3_OSM_ROVIM_OPENSTACK_URL \
$PYTHON3_OSM_ROVIM_OPENVIM_URL \
$PYTHON3_OSM_ROVIM_VMWARE_URL ; do \
@@
-79,14
+79,24
@@
RUN pip3 install \
-r /usr/lib/python3/dist-packages/osm_common/requirements.txt \
-r /usr/lib/python3/dist-packages/osm_ng_ro/requirements.txt
-r /usr/lib/python3/dist-packages/osm_common/requirements.txt \
-r /usr/lib/python3/dist-packages/osm_ng_ro/requirements.txt
-FROM ubuntu:18.04
+#######################################################################################
+FROM ubuntu:20.04 as FINAL
+
+ARG APT_PROXY
+RUN if [ ! -z $APT_PROXY ] ; then \
+ echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
+ echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\
+ fi
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
- DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
+ DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+ python3-minimal=3.8.* \
+ && rm -rf /var/lib/apt/lists/*
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/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
+COPY --from=INSTALL /usr/local/lib/python3.
8/dist-packages /usr/local/lib/python3.8
/dist-packages
COPY --from=INSTALL /usr/bin/genisoimage /usr/bin/genisoimage
COPY --from=INSTALL /usr/bin/genisoimage /usr/bin/genisoimage
+COPY --from=INSTALL /etc/protocols /etc/protocols
VOLUME /var/log/osm
VOLUME /var/log/osm