diff options
Diffstat (limited to 'Dockerfiles')
| -rw-r--r-- | Dockerfiles/aai-common/README.md | 20 | ||||
| -rw-r--r-- | Dockerfiles/haproxy/Dockerfile | 17 |
2 files changed, 20 insertions, 17 deletions
diff --git a/Dockerfiles/aai-common/README.md b/Dockerfiles/aai-common/README.md index 0726e26b..82131247 100644 --- a/Dockerfiles/aai-common/README.md +++ b/Dockerfiles/aai-common/README.md @@ -2,13 +2,23 @@ ### Building the image -Run the following command if building the image in internal network +Run the following command to build AAI common images at internal network ```bash export NEW_VERSION=<NEW_VERSION> - docker build \ - -t aaionap/aai-common:${NEW_VERSION}${BASE_TAG:-"-alpine"} -f <Dockerfile.alpine | Dockerfile.ubuntu> . + export BASE_IMAGE=<alpine | ubuntu> + sudo docker build -t \ + nexus3.onap.org:10003/onap/aai-common-${BASE_IMAGE}:${NEW_VERSION} \ + -f Dockerfile.${BASE_IMAGE} . ``` -Replace the NEW\_VERSION with the new docker image version for aai-common -If different based images are required replace BASE\_TAG accordingly to the base image used. +Replace the **NEW\_VERSION** with the new docker image version for aai-common. +Set **BASE\_IMAGE** to **alpine** or **ubuntu** to build aai-common-alpine or +aai-common-ubuntu image. + +NOTE: In order to push images into Nexus3, you have to be logged into Nexus3 +with appropriate credentials first. + +NOTE2: Both alpine and ubuntu based aai-common images are built automatically +by jenkins jobs and they are available at official ONAP docker registry +(currently nexus3). diff --git a/Dockerfiles/haproxy/Dockerfile b/Dockerfiles/haproxy/Dockerfile index f6d6c283..7bf9b20a 100644 --- a/Dockerfiles/haproxy/Dockerfile +++ b/Dockerfiles/haproxy/Dockerfile @@ -1,4 +1,4 @@ -FROM haproxy:1.7 +FROM haproxy:1.7-alpine # Set up your corporate proxy if there is ENV HTTP_PROXY "" @@ -6,17 +6,10 @@ ENV HTTPS_PROXY "" ENV http_proxy "" ENV https_proxy "" -ENV DEBIAN_FRONTEND=noninteractive - -RUN if [ ! -z ${HTTP_PROXY} ]; \ - then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; \ - fi && \ - if [ ! -z ${HTTP_PROXY} ]; \ - then echo "Acquire::https::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; \ - fi && \ - apt-get update && \ - apt-get -y install ca-certificates openssl curl && \ - rm -rf /var/lib/apt/lists/* +RUN apk add --no-cache \ + ca-certificates \ + curl \ + openssl RUN mkdir -p /etc/ssl/certs/ && mkdir -p /etc/ssl/private |