diff options
author | Bogumil Zebek <bogumil.zebek@nokia.com> | 2020-04-15 06:40:50 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-04-15 06:40:50 +0000 |
commit | 1dd7aeb09c3383fa9c71ceea6dd553e0408d1dda (patch) | |
tree | df29cd3da83a59ef64a94d8e15d8cf4ff8ea4e04 | |
parent | 8ee7d73022412ebe5d5f95745c54844d7a2b47ef (diff) | |
parent | 191b9388c84550c17150464b73c248cfa69c307a (diff) |
Merge "Update versions and base images in dockerfiles"
-rw-r--r-- | netconfsimulator/Dockerfile_app | 6 | ||||
-rw-r--r-- | netconfsimulator/Dockerfile_netopeer | 2 | ||||
-rw-r--r-- | netconfsimulator/docker/Dockerfile | 4 | ||||
-rw-r--r-- | pnfsimulator/Dockerfile | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/netconfsimulator/Dockerfile_app b/netconfsimulator/Dockerfile_app index a775219..2043b8a 100644 --- a/netconfsimulator/Dockerfile_app +++ b/netconfsimulator/Dockerfile_app @@ -1,4 +1,4 @@ -FROM openjdk:8-jre-alpine +FROM docker.io/openjdk:8-jre-alpine ADD target/libs /app/libs -ADD target/netconfsimulator-5.0.0-SNAPSHOT.jar /app/netconf-simulator.jar -CMD java -cp /app/libs/*:/app/netconf-simulator.jar org.onap.netconfsimulator.Main
\ No newline at end of file +ADD target/netconfsimulator-1.0.0-SNAPSHOT.jar /app/netconf-simulator.jar +CMD java -cp /app/libs/*:/app/netconf-simulator.jar org.onap.netconfsimulator.Main diff --git a/netconfsimulator/Dockerfile_netopeer b/netconfsimulator/Dockerfile_netopeer index 9fe56e1..ad8db7c 100644 --- a/netconfsimulator/Dockerfile_netopeer +++ b/netconfsimulator/Dockerfile_netopeer @@ -1,4 +1,4 @@ -FROM sysrepo/sysrepo-netopeer2:v0.7.7 +FROM docker.io/sysrepo/sysrepo-netopeer2:v0.7.7 ADD apt.conf /etc/apt/apt.conf RUN apt-get update && apt-get install -y python3 python3-pip python-pip && pip3 install flask flask_restful kafka-python && pip install kafka-python RUN cd /opt/dev/sysrepo && cmake -DGEN_PYTHON_VERSION=2 -DREPOSITORY_LOC:PATH=/etc/sysrepo . && make install diff --git a/netconfsimulator/docker/Dockerfile b/netconfsimulator/docker/Dockerfile index 0e25fd3..63bb3ee 100644 --- a/netconfsimulator/docker/Dockerfile +++ b/netconfsimulator/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8-jre-alpine +FROM docker.io/openjdk:8-jre-alpine ADD libs /app/libs -ADD netconfsimulator-5.0.0-SNAPSHOT.jar /app/netconf-simulator.jar +ADD netconfsimulator-1.0.0-SNAPSHOT.jar /app/netconf-simulator.jar CMD java -cp /app/libs/*:/app/netconf-simulator.jar org.onap.netconfsimulator.Main diff --git a/pnfsimulator/Dockerfile b/pnfsimulator/Dockerfile index aafea0e..4202047 100644 --- a/pnfsimulator/Dockerfile +++ b/pnfsimulator/Dockerfile @@ -1,6 +1,6 @@ -FROM openjdk:8-jre-alpine +FROM docker.io/openjdk:8-jre-alpine ADD target/libs /app/libs -ADD target/pnfsimulator-5.0.0-SNAPSHOT.jar /app/pnf-simulator.jar +ADD target/pnfsimulator-1.0.0-SNAPSHOT.jar /app/pnf-simulator.jar CMD apk update CMD apk add ca-certificates ADD certificates /usr/local/share/ca-certificates/ |