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 1703 - Adding non-root user to run NBI
[osm/devops.git]
/
docker
/
tests
/
Dockerfile
diff --git
a/docker/tests/Dockerfile
b/docker/tests/Dockerfile
index
115f8fb
..
d7dfcdb
100644
(file)
--- a/
docker/tests/Dockerfile
+++ b/
docker/tests/Dockerfile
@@
-15,22
+15,24
@@
########################################################################
########################################################################
-FROM ubuntu:
18.04 as INSTAL
L
+FROM ubuntu:
20.04 as FINA
L
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.* \
- python3=3.6.* \
- python3-dev=3.6.* \
- python3-setuptools=39.0.* \
- curl=7.58.* \
+ 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 \
gettext-base=0.19.* \
gettext-base=0.19.* \
- git=1:2.
17
.* \
+ git=1:2.
25
.* \
iputils-ping=3:* \
iputils-ping=3:* \
- jq=1.5* \
- libcurl4-openssl-dev=7.58.* \
- libssl-dev=1.1.* && \
- python3 -m easy_install pip==21.0.1 setuptools==51.0.0
+ jq=1.6* \
+ libcurl4-openssl-dev=7.68.* \
+ libssl-dev=1.1.*
ARG OSM_TESTS_URL
ARG PYTHON3_OSM_IM_URL
ARG OSM_TESTS_URL
ARG PYTHON3_OSM_IM_URL
@@
-54,6
+56,7
@@
RUN mv /usr/share/osm-tests/robot-systest /robot-systest
RUN mv /usr/share/osm-tests/conformance-tests/ /robot-systest/
RUN mv /usr/share/osm-tests/charm.sh /usr/sbin/charm
RUN mv /usr/share/osm-tests/conformance-tests/ /robot-systest/
RUN mv /usr/share/osm-tests/charm.sh /usr/sbin/charm
+ARG CACHE_DATE=not_a_date
RUN git clone \
https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git \
--recurse-submodules \
RUN git clone \
https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git \
--recurse-submodules \