diff options
| author |   Bilal A <bilal@research.att.com> | 2019-06-07 21:25:59 +0000 |
|---|---|---|
| committer | Bilal A <bilal@research.att.com> | 2019-06-10 21:51:47 +0000 |
| commit | c5fc0e448929f393941870cf071f3f1f54c4604c (patch) | |
| tree | fac8a94f3a4ba7db2414c2ac1852637689d7d28a /scripts | |
| parent | 4f4849dc9bd3b584e564ccd83651607941f2a95e (diff) | |
Pull correct docker images.
Enables Policy CSITs for API, PAP, Distribution and XACML-PDP
to pull correct docker images based on the code branch.
Issue-ID: POLICY-1834
Signed-off-by: Bilal A <bilal@research.att.com>
Change-Id: I6b99c8ae9cb78dd8ebddc522bc2a7080ec6e5735
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/policy/config/policy-csit.conf | 1 | ||||
| -rw-r--r-- | scripts/policy/docker-compose-api.yml | 2 | ||||
| -rw-r--r-- | scripts/policy/docker-compose-pap.yml | 4 | ||||
| -rw-r--r-- | scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/scripts/policy/config/policy-csit.conf b/scripts/policy/config/policy-csit.conf new file mode 100644 index 00000000..1b6657a5 --- /dev/null +++ b/scripts/policy/config/policy-csit.conf @@ -0,0 +1 @@ +GERRIT_BRANCH=dublin diff --git a/scripts/policy/docker-compose-api.yml b/scripts/policy/docker-compose-api.yml index 5cf5a27c..bb1ca34f 100644 --- a/scripts/policy/docker-compose-api.yml +++ b/scripts/policy/docker-compose-api.yml @@ -27,7 +27,7 @@ services: ports: - "3306:3306" api: - image: nexus3.onap.org:10001/onap/policy-api + image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION} container_name: policy-api depends_on: - mariadb diff --git a/scripts/policy/docker-compose-pap.yml b/scripts/policy/docker-compose-pap.yml index 383e1bc8..466d9baf 100644 --- a/scripts/policy/docker-compose-pap.yml +++ b/scripts/policy/docker-compose-pap.yml @@ -27,7 +27,7 @@ services: ports: - "3306:3306" pap: - image: nexus3.onap.org:10001/onap/policy-pap + image: nexus3.onap.org:10001/onap/policy-pap:${POLICY_PAP_VERSION} container_name: policy-pap depends_on: - mariadb @@ -35,7 +35,7 @@ services: ports: - "6969:6969" api: - image: nexus3.onap.org:10001/onap/policy-api + image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION} container_name: policy-api depends_on: - mariadb diff --git a/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml b/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml index 96a4b122..8c1b0636 100644 --- a/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml +++ b/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml @@ -37,20 +37,20 @@ services: ports: - "3904:3904" pap: - image: nexus3.onap.org:10001/onap/policy-pap + image: nexus3.onap.org:10001/onap/policy-pap:${POLICY_PAP_VERSION} container_name: policy-pap depends_on: - mariadb - message-router hostname: policy-pap api: - image: nexus3.onap.org:10001/onap/policy-api + image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION} container_name: policy-api depends_on: - mariadb hostname: policy-api xacml-pdp: - image: nexus3.onap.org:10001/onap/policy-xacml-pdp + image: nexus3.onap.org:10001/onap/policy-xacml-pdp:${POLICY_XACML_PDP_VERSION} container_name: policy-xacml-pdp depends_on: - mariadb |