aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormorganrol <morgan.richomme@orange.com>2021-08-19 15:02:22 +0200
committermorganrol <morgan.richomme@orange.com>2021-08-23 12:09:15 +0200
commit771c3370182ba117978edf296c9145cb387e2c1b (patch)
treebca5b498e7b0764d9a1e68175c82a866e21262f1
parent2e7b7aa9773c4aa8e0334a1398bb12171e6b53d8 (diff)
[UPSTREAM] Update upstream versions
use - helm clien 3.3.4 - kubernetes client 1.19.11 remove useless PIP tag Issue-ID: INT-1958 Signed-off-by: morganrol <morgan.richomme@orange.com> Change-Id: Ie613e575161120fdc4ade43ca756e5943c7fa44b
-rw-r--r--healthcheck/docker/Dockerfile2
-rw-r--r--infra-healthcheck/docker/Dockerfile2
-rw-r--r--security/docker/Dockerfile8
3 files changed, 6 insertions, 6 deletions
diff --git a/healthcheck/docker/Dockerfile b/healthcheck/docker/Dockerfile
index 9fbef70..60422ef 100644
--- a/healthcheck/docker/Dockerfile
+++ b/healthcheck/docker/Dockerfile
@@ -1,9 +1,9 @@
FROM opnfv/xtesting:jerma
ARG OPENSTACK_TAG=master
+ARG PIP_TAG=20.1
ARG OPNFV_TAG=master
ARG ONAP_TAG=master
-ARG PIP_TAG=20.1
ENV PYTHONPATH $PYTHONPATH:/src/testing-utils/robotframework-onap/eteutils
ENV TAG all
diff --git a/infra-healthcheck/docker/Dockerfile b/infra-healthcheck/docker/Dockerfile
index 20819ed..24fa61d 100644
--- a/infra-healthcheck/docker/Dockerfile
+++ b/infra-healthcheck/docker/Dockerfile
@@ -1,6 +1,6 @@
FROM opnfv/xtesting:wallaby
-ARG KUBERNETES_VERSION="v1.19.9"
+ARG KUBERNETES_VERSION="v1.19.11"
ARG HELM_VERSION="v2.16.6"
ARG HELM3_VERSION="v3.3.4"
ARG ONAP_TESTS_TAG=master
diff --git a/security/docker/Dockerfile b/security/docker/Dockerfile
index ded4d3e..9bfd2cc 100644
--- a/security/docker/Dockerfile
+++ b/security/docker/Dockerfile
@@ -1,16 +1,16 @@
-FROM golang:1.13 AS build_yq
+FROM golang:1.17 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 CGO_ENABLED=0 go install -a -ldflags '-w -s -extldflags "-static"'
-FROM golang:1.13 AS build_aqua
+FROM golang:1.17 AS build_aqua
WORKDIR /go/src/github.com/aquasecurity/
RUN git clone https://github.com/aquasecurity/kube-bench.git --depth 1
WORKDIR /go/src/github.com/aquasecurity/kube-bench
RUN GO111MODULE=on CGO_ENABLED=0 go install -a -ldflags "-w"
-FROM golang:1.13 AS build_onap
+FROM golang:1.17 AS build_onap
WORKDIR /opt/onap
RUN git clone https://git.onap.org/integration --depth 1
WORKDIR /opt/onap/integration/test/security/sslendpoints
@@ -18,7 +18,7 @@ RUN CGO_ENABLED=0 go install -a -ldflags '-w -s -extldflags "-static"'
FROM opnfv/xtesting:wallaby AS run
-ARG KUBERNETES_VERSION="v1.19.9"
+ARG KUBERNETES_VERSION="v1.19.11"
ARG ONAP_TAG=master
ARG ONAP_TESTS_TAG=master