From e46f74d64fe69d33d5038704b64993aa9cab59fc Mon Sep 17 00:00:00 2001 From: Taka Cho Date: Fri, 4 Sep 2020 08:58:25 -0400 Subject: [PATCH] point to 2.1.0 policy-alpine base - model-sim In G-rel, using 2.1.0 base. Issue-ID: POLICY-2789 Change-Id: I165debaf20267c0b1c3141bff805a29595f1eccf Signed-off-by: Taka Cho --- models-sim/models-sim-dmaap/src/main/package/docker/Dockerfile | 8 ++------ .../policy-models-sim-pdp/src/main/package/docker/Dockerfile | 8 ++------ .../policy-models-sim-pdp/src/main/package/docker/docker_build.sh | 0 .../policy-models-simulators/src/main/package/docker/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 13 deletions(-) mode change 100644 => 100755 models-sim/policy-models-sim-pdp/src/main/package/docker/docker_build.sh diff --git a/models-sim/models-sim-dmaap/src/main/package/docker/Dockerfile b/models-sim/models-sim-dmaap/src/main/package/docker/Dockerfile index 495924d5b..e07a8b044 100644 --- a/models-sim/models-sim-dmaap/src/main/package/docker/Dockerfile +++ b/models-sim/models-sim-dmaap/src/main/package/docker/Dockerfile @@ -1,7 +1,7 @@ # # ============LICENSE_START======================================================= # Copyright (C) 2019 Nordix Foundation. -# Modifications Copyright (C) 2019 AT&T Intellectual Property. +# Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,11 +19,7 @@ # ============LICENSE_END========================================================= # -# -# Docker file to build an image that runs the DMaaP simulator on Java 8 in alpine -# - -FROM onap/policy-jre-alpine +FROM onap/policy-jre-alpine:2.1.0 LABEL maintainer="Policy Team" diff --git a/models-sim/policy-models-sim-pdp/src/main/package/docker/Dockerfile b/models-sim/policy-models-sim-pdp/src/main/package/docker/Dockerfile index b70844e65..8152304ba 100644 --- a/models-sim/policy-models-sim-pdp/src/main/package/docker/Dockerfile +++ b/models-sim/policy-models-sim-pdp/src/main/package/docker/Dockerfile @@ -1,7 +1,7 @@ # # ============LICENSE_START======================================================= # Copyright (C) 2019 Nordix Foundation. -# Modifications Copyright (C) 2019 AT&T Intellectual Property. +# Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,11 +19,7 @@ # ============LICENSE_END========================================================= # -# -# Docker file to build an image that runs the PDP simulator on Java 8 in alpine -# - -FROM onap/policy-jre-alpine +FROM onap/policy-jre-alpine:2.1.0 LABEL maintainer="Policy Team" diff --git a/models-sim/policy-models-sim-pdp/src/main/package/docker/docker_build.sh b/models-sim/policy-models-sim-pdp/src/main/package/docker/docker_build.sh old mode 100644 new mode 100755 diff --git a/models-sim/policy-models-simulators/src/main/package/docker/Dockerfile b/models-sim/policy-models-simulators/src/main/package/docker/Dockerfile index c41cd3804..a6ddba7d5 100644 --- a/models-sim/policy-models-simulators/src/main/package/docker/Dockerfile +++ b/models-sim/policy-models-simulators/src/main/package/docker/Dockerfile @@ -24,7 +24,7 @@ # Docker file to build an image that runs the simulators # -FROM onap/policy-jre-alpine:2.0.1 +FROM onap/policy-jre-alpine:2.1.0 LABEL maintainer="Policy Team" -- 2.16.6