diff options
| author |   Alexander Mazuruk <a.mazuruk@samsung.com> | 2021-02-18 15:26:31 +0100 |
|---|---|---|
| committer | Alexander Mazuruk <a.mazuruk@samsung.com> | 2021-02-23 13:30:17 +0100 |
| commit | 0176fc34624599b5a51c4d18373a70f57776bccd (patch) | |
| tree | 3f7134b9a7f1cc35fae0350a4f76eafdbf4e2bf8 /ccsdk-app-os | |
| parent | 897bb72e4fe5ddb5a581b8ad80629373bd7a9bfe (diff) | |
Change openjdk baseOS img to integration-java11
This change should not have any effects on functionality as integration
image is built on top of adoptopenjdk/openjdk11:jre-11.0.8_10-alpine.
Benefits from switching over:
* minimal {java11,python} images maintained by integration team
* using currently "blessed by seccom" versions (if :latest tag used)
* should limit spread of legal issues across layers
* integration images will be the first to have automated compliance
documentation
* should limit spread of base layers (contributing to deployment
footprint - more base layers = more to download, more to store etc...)
Issue-ID: INT-1864
Signed-off-by: Alexander Mazuruk <a.mazuruk@samsung.com>
Change-Id: Ief4ce98f55a97a3ae3d7cdb2ea8f351c79a475b8
Diffstat (limited to 'ccsdk-app-os')
| -rw-r--r-- | ccsdk-app-os/Dockerfile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ccsdk-app-os/Dockerfile b/ccsdk-app-os/Dockerfile index 877f62f..b29b59a 100644 --- a/ccsdk-app-os/Dockerfile +++ b/ccsdk-app-os/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine +FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0 #FROM tomcat:jdk11-adoptopenjdk-openj9 USER root @@ -12,8 +12,8 @@ COPY target/ccsdk*.war /tmp/ccsdk-app.war ARG user=onap ARG group=onap -RUN apk update \ - && apk add wget zip dos2unix postgresql \ +RUN apk add --update --no-cache --virtual .setup-deps wget zip dos2unix \ + && apk add postgresql \ && wget -q http://archive.apache.org/dist/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37.tar.gz \ && tar -xzf apache-tomcat-9.0.37.tar.gz \ && rm -f apache-tomcat-9.0.37.tar.gz \ @@ -25,10 +25,10 @@ RUN apk update \ && dos2unix /tmp/docker-dashboard-installation.sh \ && chmod +x /tmp/create_table.sql \ && chmod +x /tmp/docker-dashboard-installation.sh \ - && addgroup -S $group && adduser -G $group -D $user \ && chown -R $user:$group ${CATALINA_HOME} \ && chown -R $user:$group /tmp \ - && chown -R $user:$group /opt/logs/dcae/dashboard + && chown -R $user:$group /opt/logs/dcae/dashboard \ + && apk del .setup-deps USER ${user} WORKDIR $CATALINA_HOME |