Merge "Renamed docker images"
diff --git a/README.md b/README.md
index 2a27c7b..0622cdb 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
policy-nexus
For example:
-docker build -t onap/policy/policy-nexus policy-nexus
+docker build -t onap/policy-nexus policy-nexus
In addition, this source repository contains a docker-compose.yml file and associated configuration files (in the 'config' directory) that can be used to start up the ONAP Policy Engine docker containers
diff --git a/docker-compose-integration.yml b/docker-compose-integration.yml
index d13b9a9..1e42bbe 100644
--- a/docker-compose-integration.yml
+++ b/docker-compose-integration.yml
@@ -11,11 +11,11 @@
expose:
- 3306
nexus:
- image: onap/policy/policy-nexus
+ image: onap/policy-nexus
container_name: nexus
hostname: nexus
pap:
- image: onap/policy/policy-pe
+ image: onap/policy-pe
environment:
- PRELOAD_POLICIES=${PRELOAD_POLICIES}
container_name: pap
@@ -29,7 +29,7 @@
volumes:
- ./config/pe:/tmp/policy-install/config
pdp:
- image: onap/policy/policy-pe
+ image: onap/policy-pe
container_name: pdp
depends_on:
- pap
@@ -40,7 +40,7 @@
volumes:
- ./config/pe:/tmp/policy-install/config
brmsgw:
- image: onap/policy/policy-pe
+ image: onap/policy-pe
container_name: brmsgw
depends_on:
- pap
@@ -49,7 +49,7 @@
volumes:
- ./config/pe:/tmp/policy-install/config
drools:
- image: onap/policy/policy-drools
+ image: onap/policy-drools
container_name: drools
depends_on:
- mariadb
diff --git a/docker-compose.yml b/docker-compose.yml
index 88422d0..282625a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,11 +16,11 @@
ports:
- "3306:3306"
nexus:
- image: onap/policy/policy-nexus
+ image: onap/policy-nexus
container_name: nexus
hostname: nexus
pap:
- image: onap/policy/policy-pe
+ image: onap/policy-pe
environment:
- PRELOAD_POLICIES=${PRELOAD_POLICIES}
container_name: pap
@@ -34,7 +34,7 @@
volumes:
- ./config/pe:/tmp/policy-install/config
pdp:
- image: onap/policy/policy-pe
+ image: onap/policy-pe
container_name: pdp
depends_on:
- pap
@@ -45,7 +45,7 @@
volumes:
- ./config/pe:/tmp/policy-install/config
brmsgw:
- image: onap/policy/policy-pe
+ image: onap/policy-pe
container_name: brmsgw
depends_on:
- pap
@@ -54,7 +54,7 @@
volumes:
- ./config/pe:/tmp/policy-install/config
drools:
- image: onap/policy/policy-drools
+ image: onap/policy-drools
container_name: drools
depends_on:
- mariadb
diff --git a/docker_build.sh b/docker_build.sh
index 5fe01be..9a83d6a 100755
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -48,19 +48,19 @@
#
# This is the local latest tagged image. The Dockerfile's need this to build images
#
-TAGS="--tag onap/policy/${IMAGE}:latest"
+TAGS="--tag onap/${IMAGE}:latest"
#
# This is the nexus repo prepended for latest tagged image.
#
-TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${IMAGE}:latest"
+TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:latest"
#
# This has the nexus repo prepended and only major/minor version with latest
#
-TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${IMAGE}:${MVN_MAJMIN_VERSION}-latest"
+TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-latest"
#
# This has the nexus repo prepended and major/minor/patch version with timestamp
#
-TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}"
+TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}"
echo $TAGS
@@ -77,7 +77,7 @@
echo "Pushing $IMAGE"
-docker push ${DOCKER_REPOSITORY}/onap/policy/$IMAGE:latest
+docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:latest
if [ $? -ne 0 ]
then
@@ -86,7 +86,7 @@
fi
-docker push ${DOCKER_REPOSITORY}/onap/policy/$IMAGE:${MVN_MAJMIN_VERSION}-latest
+docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:${MVN_MAJMIN_VERSION}-latest
if [ $? -ne 0 ]
then
@@ -94,7 +94,7 @@
exit 1
fi
-docker push ${DOCKER_REPOSITORY}/onap/policy/$IMAGE:${MVN_VERSION}-STAGING-${TIMESTAMP}
+docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:${MVN_VERSION}-STAGING-${TIMESTAMP}
if [ $? -ne 0 ]
then
diff --git a/docker_merge.sh b/docker_merge.sh
index ae00319..72f1532 100755
--- a/docker_merge.sh
+++ b/docker_merge.sh
@@ -48,15 +48,15 @@
#
# This is the local latest tagged image. The Dockerfile's need this to build images
#
-TAGS="--tag onap/policy/${IMAGE}:latest"
+TAGS="--tag onap/${IMAGE}:latest"
#
# This has the nexus repo prepended and only major/minor version with latest
#
-TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${IMAGE}:${MVN_MAJMIN_VERSION}-latest"
+TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-latest"
#
# This has the nexus repo prepended and major/minor/patch version with timestamp
#
-TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}"
+TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}"
echo $TAGS
@@ -75,7 +75,7 @@
# Push image
#
echo "Pushing $IMAGE"
-docker push ${DOCKER_REPOSITORY}/onap/policy/$IMAGE:${MVN_MAJMIN_VERSION}-latest
+docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:${MVN_MAJMIN_VERSION}-latest
if [ $? -ne 0 ]
then
@@ -83,7 +83,7 @@
exit 1
fi
-docker push ${DOCKER_REPOSITORY}/onap/policy/$IMAGE:${MVN_VERSION}-${TIMESTAMP}
+docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:${MVN_VERSION}-${TIMESTAMP}
if [ $? -ne 0 ]
then
diff --git a/docker_verify.sh b/docker_verify.sh
index 62e715d..a458873 100755
--- a/docker_verify.sh
+++ b/docker_verify.sh
@@ -51,15 +51,15 @@
#
# This is the local latest tagged image. The Dockerfile's need this to build images
#
-TAGS="--tag onap/policy/${IMAGE}:latest"
+TAGS="--tag onap/${IMAGE}:latest"
#
# This has the nexus repo prepended and only major/minor version with latest
#
-TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${IMAGE}:${MVN_MAJMIN_VERSION}-latest"
+TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-latest"
#
# This has the nexus repo prepended and major/minor/patch version with timestamp
#
-TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}"
+TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}"
echo $TAGS
diff --git a/vagrant/setup_policy.sh b/vagrant/setup_policy.sh
index 5648fd4..6ee7c38 100755
--- a/vagrant/setup_policy.sh
+++ b/vagrant/setup_policy.sh
@@ -21,14 +21,14 @@
for comp in policy-pe policy-drools
do
cd $HOME/$comp
- sudo docker build -t onap/policy/$comp packages/docker/target/$comp
+ sudo docker build -t onap/$comp packages/docker/target/$comp
done
cd $HOME
git clone http://gerrit.onap.org/r/policy/docker
cd docker
-sudo docker build -t onap/policy/policy-nexus policy-nexus
+sudo docker build -t onap/policy-nexus policy-nexus
cd $HOME/docker
chmod +x config/drools/drools-tweaks.sh