summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ansible-server/pom.xml20
-rw-r--r--ansible-server/src/main/Dockerfile25
-rw-r--r--ansible-server/src/main/resources/README-custom-certs.md3
-rwxr-xr-xdependencies/pom.xml2
-rw-r--r--opendaylight/argon/pom.xml2
-rw-r--r--pom.xml4
6 files changed, 47 insertions, 9 deletions
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 @@
</resources>
</configuration>
</execution>
+ <execution>
+ <id>copy-certificates</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals><!-- here the phase you need -->
+ <phase>validate</phase>
+ <configuration>
+ <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>*.pem</include>
+ <include>*.md</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
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 @@
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
- <version>2.18.0</version>
+ <version>2.19.1</version>
</dependency>
</dependencies>
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 @@
</modules>
<properties>
- <ccsdk.opendaylight.version>0.18.1</ccsdk.opendaylight.version>
+ <ccsdk.opendaylight.version>0.18.2</ccsdk.opendaylight.version>
</properties>
<dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 8766bac6..cfcc1dfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>oparent</artifactId>
- <version>2.6.0</version>
+ <version>2.6.1</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
@@ -31,7 +31,7 @@
<properties>
<application.name>distribution</application.name>
- <ccsdk.sli.version>1.7.1-SNAPSHOT</ccsdk.sli.version>
+ <ccsdk.sli.version>1.7.1</ccsdk.sli.version>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<ccsdk.distribution.version>${project.version}</ccsdk.distribution.version>