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 <jrh3@att.com>

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 e07a8b0..495924d 100644 (file)
--- 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 8152304..b70844e 100644 (file)
--- 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 (executable)
new mode 100644 (file)

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 a6ddba7..c41cd38 100644 (file)
--- 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"