diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-09-01 16:21:53 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-09-01 16:24:53 -0400 |
| commit | 0b9839e70cb6a3ba1328f37792d33cd1896309ef (patch) | |
| tree | 0015f5c1e97ae2f0a2f05e072aa375eb1f7b4806 /alpine | |
| parent | 884302ca87b0544c885d4eb7a95eab3a9593483d (diff) | |
Update to use ONAP standard base images
Updated all containers to use one of the 2 approved ONAP base images:
- onap/integration-java11
- onap/integration-python
Change-Id: I961e9af38d790f74528a726a0fc68d1a2e5fbfb9
Issue-ID: CCSDK-2418
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'alpine')
| -rw-r--r-- | alpine/java11/pom.xml | 2 | ||||
| -rw-r--r-- | alpine/java11/src/main/docker/Dockerfile | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml index e160665c..8370e92a 100644 --- a/alpine/java11/pom.xml +++ b/alpine/java11/pom.xml @@ -22,6 +22,8 @@ <image.name>onap/ccsdk-alpine-j11-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> + <base.image>onap/integration-java11</base.image> + <base.image.version>7.1.0</base.image.version> </properties> <build> diff --git a/alpine/java11/src/main/docker/Dockerfile b/alpine/java11/src/main/docker/Dockerfile index af1297c0..d7077f30 100644 --- a/alpine/java11/src/main/docker/Dockerfile +++ b/alpine/java11/src/main/docker/Dockerfile @@ -1,9 +1,7 @@ # Base alpine with added packages needed for open ecomp -FROM alpine:3.11.3 +FROM ${base.image}:${base.image.version} +MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) -LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)" - -RUN apk update && apk add --no-cache openjdk11 python3 graphviz unzip rsync nss mysql-client nodejs ARG HTTP_PROXY ARG HTTPS_PROXY @@ -12,4 +10,8 @@ ENV http_proxy ${HTTP_PROXY} ENV HTTPS_PROXY ${HTTPS_PROXY} ENV https_proxy ${HTTPS_PROXY} -ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk
\ No newline at end of file +ENV JAVA_HOME /opt/java/openjdk +# Add tools needed for OpenDaylight +USER root +RUN apk update && apk --no-cache add bash git maven mysql-client nodejs npm python3 py3-pip graphviz unzip rsync nss +USER onap
\ No newline at end of file |