From 02d8fad0dfa0c007386beae24e25bbbd0eed130b Mon Sep 17 00:00:00 2001 From: liamfallon Date: Mon, 12 Sep 2022 16:01:26 +0100 Subject: Convert CSIT tests to use HTTP rather than HTTPS This commit converts the CSITs from HTTPS to HTTP. It also does some refactoring and tidying up on the CSIT environment. Issue-ID: POLICY-4338 Change-Id: I02afa5c7a585470fa0bda521e97bf1cdcf6a95c2 Signed-off-by: liamfallon --- policy-jdk/alpine/src/main/docker/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'policy-jdk/alpine/src') diff --git a/policy-jdk/alpine/src/main/docker/Dockerfile b/policy-jdk/alpine/src/main/docker/Dockerfile index 7f8fd91b..1922e394 100644 --- a/policy-jdk/alpine/src/main/docker/Dockerfile +++ b/policy-jdk/alpine/src/main/docker/Dockerfile @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (C) 2019 Tieto. All rights reserved. # Modifications Copyright (C) 2020, 2021 AT&T Intellectual Property. All rights reserved. -# Modifications Copyright (C) 2020 Nordix Foundation. +# Modifications Copyright (C) 2020,2022 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,8 +23,10 @@ # $JAVA_HOME is set to /usr/lib/jvm/java-11-openjdk # more details at https://hub.docker.com/_/openjdk -FROM onap/integration-python:9.1.0 +ARG INTEGRATION_PYTHON_NAME=${INTEGRATION_PYTHON_NAME} +ARG INTEGRATION_PYTHON_VERSION=${INTEGRATION_PYTHON_VERSION} +FROM ${INTEGRATION_PYTHON_NAME}:${INTEGRATION_PYTHON_VERSION} LABEL maintainer="Policy Team" ENV POLICY_HOME=/opt/app/policy -- cgit 1.2.3-korg