From 6fbbadb867a69d65761086789a0b411452e8ea3a Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 16 Aug 2023 14:06:36 -0400 Subject: Update to version 2.6.1 of parent pom Update to version 2.6.1 of parent pom to pick up Argon SR2 versions and support local build of ansible-server Issue-ID: CCSDK-3944 Signed-off-by: Dan Timoney Change-Id: I6d454ecc4ec3d1fecd10bf823ca5b828718e5fea --- ansible-server/pom.xml | 20 +++++++++++++++++ ansible-server/src/main/Dockerfile | 25 +++++++++++++++++----- .../src/main/resources/README-custom-certs.md | 3 +++ dependencies/pom.xml | 2 +- opendaylight/argon/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 ansible-server/src/main/resources/README-custom-certs.md diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index 15faf5ae..1a56fee6 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -71,6 +71,26 @@ + + copy-certificates + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/resources + + *.pem + *.md + + false + + + + diff --git a/ansible-server/src/main/Dockerfile b/ansible-server/src/main/Dockerfile index 1aeb186f..984333da 100644 --- a/ansible-server/src/main/Dockerfile +++ b/ansible-server/src/main/Dockerfile @@ -2,10 +2,17 @@ FROM onap/integration-python:8.0.0 LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)" USER root -ENV http_proxy ${http_proxy} -ENV https_proxy ${https_proxy} +ARG http_proxy +ARG https_proxy +ARG no_proxy +ARG CURL_CA_BUNDLE + +ENV http_proxy $http_proxy +ENV https_proxy $https_proxy +ENV no_proxy $no_proxy ENV PIP_EXTRA_OPTS ${https_proxy:+"--trusted-host pypi.org --trusted-host files.pythonhosted.org --proxy=${https_proxy}"} ENV PIP_EXTRA_OPTS ${PIP_EXTRA_OPTS:-""} +ENV CURL_CA_BUNDLE=$CURL_CA_BUNDLE ARG PIP_TAG=18.0 @@ -13,12 +20,20 @@ RUN addgroup -S ansible && adduser -S ansible -G ansible COPY --chown=ansible:ansible ansible-server /opt/ansible-server COPY --chown=ansible:ansible configuration/ansible.cfg /etc/ansible/ansible.cfg +# Copy any certs +COPY *.md *.pem /etc/ssl/certs/ + +# Install certs +RUN update-ca-certificates + +RUN echo $CURL_CA_BUNDLE && ls -l $CURL_CA_BUNDLE + RUN apk add --no-cache curl iputils bash openssh-client \ - && curl https://sh.rustup.rs -sSf | sh -s -- -y \ + && curl -k https://sh.rustup.rs -sSf | sh -s -- -y \ && source $HOME/.cargo/env \ && apk add --no-cache --virtual .build-deps build-base libffi-dev openssl-dev python3-dev \ - && pip3 install --no-cache-dir --upgrade pip ${PIP_EXTRA_OPTS} \ - && pip3 install --no-cache-dir -r /opt/ansible-server/requirements.txt ${PIP_EXTRA_OPTS} \ + && pip3 install --no-cache-dir --trusted-host pypi.org --trusted-host files.pythonhosted.org --upgrade pip ${PIP_EXTRA_OPTS} \ + && pip3 install --no-cache-dir --trusted-host pypi.org --trusted-host files.pythonhosted.org -r /opt/ansible-server/requirements.txt ${PIP_EXTRA_OPTS} \ && apk del .build-deps \ && mkdir -p /opt/onap \ && touch /var/log/ansible-server.log \ diff --git a/ansible-server/src/main/resources/README-custom-certs.md b/ansible-server/src/main/resources/README-custom-certs.md new file mode 100644 index 00000000..ac414c11 --- /dev/null +++ b/ansible-server/src/main/resources/README-custom-certs.md @@ -0,0 +1,3 @@ +Any .pem files in this directory will be copied to /etc/ssl/certs on the +docker container and installed prior to running apk. This might be needed, +for example, for docker builds to work properly behind a corporate firewall. diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 3b18df4a..8eea86a9 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -216,7 +216,7 @@ com.google.errorprone error_prone_annotations - 2.18.0 + 2.19.1 diff --git a/opendaylight/argon/pom.xml b/opendaylight/argon/pom.xml index 7b21e3a1..07003689 100644 --- a/opendaylight/argon/pom.xml +++ b/opendaylight/argon/pom.xml @@ -19,7 +19,7 @@ - 0.18.1 + 0.18.2 diff --git a/pom.xml b/pom.xml index 8766bac6..cfcc1dfd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent oparent - 2.6.0 + 2.6.1 org.onap.ccsdk.distribution @@ -31,7 +31,7 @@ distribution - 1.7.1-SNAPSHOT + 1.7.1 ${project.version} ${project.version} -- cgit 1.2.3-korg