diff options
| author |   Michal Jagiello <michal.jagiello@t-mobile.pl> | 2022-04-19 13:59:41 +0000 |
|---|---|---|
| committer | Michal Jagiello <michal.jagiello@t-mobile.pl> | 2022-05-24 08:09:23 +0000 |
| commit | 663b15ce0744b0a3963d206828665d41a189c1d9 (patch) | |
| tree | 9e1bce26c18d792f4cd8c875a2e29f63eb4cc096 | |
| parent | 2c72245abdaaaf07382d329fe7c0d8b1db378173 (diff) | |
[SECURITY] Bump golang image version for xtesting-security
Fixes docker image build issue related with
too old golang version.
Issue-ID: INT-2105
Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl>
Change-Id: I722d2803cafb56a2768c54e20fd47d8e9a7fdaae
| -rw-r--r-- | healthcheck/docker/Dockerfile | 5 | ||||
| -rw-r--r-- | security/docker/Dockerfile | 4 | ||||
| -rw-r--r-- | smoke-usecases-robot/docker/Dockerfile | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/healthcheck/docker/Dockerfile b/healthcheck/docker/Dockerfile index db0381c..e625363 100644 --- a/healthcheck/docker/Dockerfile +++ b/healthcheck/docker/Dockerfile @@ -4,6 +4,7 @@ ARG OPENSTACK_TAG=stable/wallaby ARG PIP_TAG=20.1 ARG OPNFV_TAG=stable/jerma ARG ONAP_TAG=jakarta +ARG ARCHIVED_ONAP_TAG=master ENV PYTHONPATH $PYTHONPATH:/src/testing-utils/robotframework-onap/eteutils ENV TAG all @@ -16,8 +17,8 @@ RUN apk --no-cache add --update openssl chromium chromium-chromedriver && \ openssl-dev libjpeg-turbo-dev && \ pip3 install --upgrade pip && \ pip3 install --no-cache-dir \ - git+https://git.onap.org/testsuite/heatbridge.git@$ONAP_TAG#egg=heatbridge\&subdirectory=heatbridge \ - git+https://git.onap.org/testsuite/python-testing-utils.git@$ONAP_TAG#egg=robotframework-onap\&subdirectory=robotframework-onap && \ + git+https://git.onap.org/testsuite/heatbridge.git@$ARCHIVED_ONAP_TAG#egg=heatbridge\&subdirectory=heatbridge \ + git+https://git.onap.org/testsuite/python-testing-utils.git@$ARCHIVED_ONAP_TAG#egg=robotframework-onap\&subdirectory=robotframework-onap && \ git clone --depth 1 https://git.onap.org/testsuite -b $ONAP_TAG /var/opt/ONAP && \ git clone --depth 1 https://git.onap.org/demo -b $ONAP_TAG /src/demo && \ pip install \ diff --git a/security/docker/Dockerfile b/security/docker/Dockerfile index d0432cb..0bd8c7c 100644 --- a/security/docker/Dockerfile +++ b/security/docker/Dockerfile @@ -1,11 +1,11 @@ -FROM golang:1.17 AS build_yq +FROM golang:1.18 AS build_yq WORKDIR /go/src/github.com/mikefarah/ RUN git clone https://github.com/mikefarah/yq.git --depth 1 WORKDIR /go/src/github.com/mikefarah/yq RUN go mod tidy RUN CGO_ENABLED=0 go install -a -ldflags '-w -s -extldflags "-static"' -FROM golang:1.17 AS build_onap +FROM golang:1.18 AS build_onap WORKDIR /opt/onap RUN git clone https://git.onap.org/integration --depth 1 WORKDIR /opt/onap/integration/test/security/sslendpoints diff --git a/smoke-usecases-robot/docker/Dockerfile b/smoke-usecases-robot/docker/Dockerfile index 1ed6349..018de7a 100644 --- a/smoke-usecases-robot/docker/Dockerfile +++ b/smoke-usecases-robot/docker/Dockerfile @@ -5,6 +5,7 @@ MAINTAINER Morgan Richomme <morgan.richomme@orange.com> ARG OPENSTACK_TAG=stable/wallaby ARG OPNFV_TAG=stable/jerma ARG ONAP_TAG=jakarta +ARG ARCHIVED_ONAP_TAG=master ARG PIP_TAG=20.1 ARG KUBERNETES_VERSION="v1.19.9" ARG HELM_VERSION="v3.3.4" @@ -27,8 +28,8 @@ RUN apk --no-cache add --update openssl chromium chromium-chromedriver && \ chmod +x /usr/local/bin/kubectl && \ pip3 install --upgrade pip && \ pip3 install --no-cache-dir \ - git+https://git.onap.org/testsuite/heatbridge.git@$ONAP_TAG#egg=heatbridge\&subdirectory=heatbridge \ - git+https://git.onap.org/testsuite/python-testing-utils.git@$ONAP_TAG#egg=robotframework-onap\&subdirectory=robotframework-onap && \ + git+https://git.onap.org/testsuite/heatbridge.git@$ARCHIVED_ONAP_TAG#egg=heatbridge\&subdirectory=heatbridge \ + git+https://git.onap.org/testsuite/python-testing-utils.git@$ARCHIVED_ONAP_TAG#egg=robotframework-onap\&subdirectory=robotframework-onap && \ git clone --depth 1 https://git.onap.org/testsuite -b $ONAP_TAG /var/opt/ONAP && \ git clone --depth 1 https://git.onap.org/demo -b $ONAP_TAG /src/demo && \ pip install \ |