From 3ae776d700113671dfd244cf4981e527244d641a Mon Sep 17 00:00:00 2001 From: Alexander Mazuruk Date: Wed, 17 Feb 2021 21:36:03 +0100 Subject: [PATCH] Change openjdk baseOS imgs to integration-* 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 Change-Id: I9184e45b1d8cec294c04b462cf560f5b1c62d078 --- datarouter-node/pom.xml | 1 + datarouter-node/src/main/resources/docker/Dockerfile | 12 +++++++----- datarouter-prov/src/main/resources/docker/Dockerfile | 12 +++++++----- datarouter-subscriber/src/main/resources/docker/Dockerfile | 12 +++++++----- pom.xml | 2 +- version.properties | 2 +- 6 files changed, 24 insertions(+), 17 deletions(-) diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml index 3f0bd546..b3fdd3ca 100755 --- a/datarouter-node/pom.xml +++ b/datarouter-node/pom.xml @@ -4,6 +4,7 @@ * =========================================================================== * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2018 Nokia. All rights reserved. + * Modifications Copyright (C) 2021 Samsung Electronics. All rights reserved. * =========================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/datarouter-node/src/main/resources/docker/Dockerfile b/datarouter-node/src/main/resources/docker/Dockerfile index 35e7bd0d..7bc92c83 100644 --- a/datarouter-node/src/main/resources/docker/Dockerfile +++ b/datarouter-node/src/main/resources/docker/Dockerfile @@ -4,6 +4,7 @@ # =========================================================================== # Copyright © 2017 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2018 Nokia. All rights reserved. +# Modifications Copyright (C) 2021 Samsung Electronics. All rights reserved. # =========================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,14 +19,15 @@ # limitations under the License. # ============LICENSE_END==================================================== # -FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine +FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0 COPY /opt /opt ARG user=onap ARG group=onap -RUN apk update && apk add curl && apk add vim +USER root +RUN apk add --no-cache curl EXPOSE 8080 8443 @@ -34,7 +36,7 @@ RUN chmod 0700 startup.sh ENTRYPOINT ["sh", "startup.sh"] -RUN addgroup -S $group && adduser -G $group -D $user \ - && chown -R $user:$group /opt/ /var/log +# onap user and group already avaliable in base img +RUN chown -R $user:$group /opt/ /var/log -USER $user \ No newline at end of file +USER $user diff --git a/datarouter-prov/src/main/resources/docker/Dockerfile b/datarouter-prov/src/main/resources/docker/Dockerfile index 35e7bd0d..7bc92c83 100644 --- a/datarouter-prov/src/main/resources/docker/Dockerfile +++ b/datarouter-prov/src/main/resources/docker/Dockerfile @@ -4,6 +4,7 @@ # =========================================================================== # Copyright © 2017 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2018 Nokia. All rights reserved. +# Modifications Copyright (C) 2021 Samsung Electronics. All rights reserved. # =========================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,14 +19,15 @@ # limitations under the License. # ============LICENSE_END==================================================== # -FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine +FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0 COPY /opt /opt ARG user=onap ARG group=onap -RUN apk update && apk add curl && apk add vim +USER root +RUN apk add --no-cache curl EXPOSE 8080 8443 @@ -34,7 +36,7 @@ RUN chmod 0700 startup.sh ENTRYPOINT ["sh", "startup.sh"] -RUN addgroup -S $group && adduser -G $group -D $user \ - && chown -R $user:$group /opt/ /var/log +# onap user and group already avaliable in base img +RUN chown -R $user:$group /opt/ /var/log -USER $user \ No newline at end of file +USER $user diff --git a/datarouter-subscriber/src/main/resources/docker/Dockerfile b/datarouter-subscriber/src/main/resources/docker/Dockerfile index 35e7bd0d..7bc92c83 100644 --- a/datarouter-subscriber/src/main/resources/docker/Dockerfile +++ b/datarouter-subscriber/src/main/resources/docker/Dockerfile @@ -4,6 +4,7 @@ # =========================================================================== # Copyright © 2017 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2018 Nokia. All rights reserved. +# Modifications Copyright (C) 2021 Samsung Electronics. All rights reserved. # =========================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,14 +19,15 @@ # limitations under the License. # ============LICENSE_END==================================================== # -FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine +FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0 COPY /opt /opt ARG user=onap ARG group=onap -RUN apk update && apk add curl && apk add vim +USER root +RUN apk add --no-cache curl EXPOSE 8080 8443 @@ -34,7 +36,7 @@ RUN chmod 0700 startup.sh ENTRYPOINT ["sh", "startup.sh"] -RUN addgroup -S $group && adduser -G $group -D $user \ - && chown -R $user:$group /opt/ /var/log +# onap user and group already avaliable in base img +RUN chown -R $user:$group /opt/ /var/log -USER $user \ No newline at end of file +USER $user diff --git a/pom.xml b/pom.xml index cb4d099c..041891b3 100755 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT UTF-8 11 11 diff --git a/version.properties b/version.properties index 1ac7a413..cdff0bd7 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=2 minor=1 -patch=7 +patch=8 base_version=${major}.${minor}.${patch} -- 2.16.6