From d96719e10ca8379d7d7567c4473c8d90ab5856a1 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 4 Sep 2020 21:45:57 +0000 Subject: Revert "point to 2.1.0 policy-alpine base - model-sim" This reverts commit e46f74d64fe69d33d5038704b64993aa9cab59fc. Reason for revert: some CSITs broken because the can't find the image Issue-ID: POLICY-2789 Change-Id: Id6355c21789281a3f25467b3bd6e2e48d22533f5 Signed-off-by: Jim Hahn --- 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, 13 insertions(+), 5 deletions(-) mode change 100755 => 100644 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 e07a8b044..495924d5b 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-2020 AT&T Intellectual Property. +# Modifications Copyright (C) 2019 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,7 +19,11 @@ # ============LICENSE_END========================================================= # -FROM onap/policy-jre-alpine:2.1.0 +# +# Docker file to build an image that runs the DMaaP simulator on Java 8 in alpine +# + +FROM onap/policy-jre-alpine 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 8152304ba..b70844e65 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-2020 AT&T Intellectual Property. +# Modifications Copyright (C) 2019 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,7 +19,11 @@ # ============LICENSE_END========================================================= # -FROM onap/policy-jre-alpine:2.1.0 +# +# Docker file to build an image that runs the PDP simulator on Java 8 in alpine +# + +FROM onap/policy-jre-alpine 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 100755 new mode 100644 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 a6ddba7d5..c41cd3804 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.1.0 +FROM onap/policy-jre-alpine:2.0.1 LABEL maintainer="Policy Team" -- cgit 1.2.3-korg