aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2022-09-30 14:48:11 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2022-09-30 14:48:11 +0200
commit605c5efcbbf4103ac6f39448fd808aa2f9b896bb (patch)
tree20ab69bba33257907eb3291974cd3eb7a991f3ce /docker
parentb4772fb2e1302512801eadf44ae088adf79f96a7 (diff)
Fix docker tags
Change-Id: Ibbeab1b318a097d1f53b9251214f2e6a85ee63f3 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/benchmarking/Dockerfile2
-rw-r--r--docker/cnf/Dockerfile2
-rw-r--r--docker/core/Dockerfile6
-rw-r--r--docker/healthcheck/Dockerfile2
-rw-r--r--docker/security/Dockerfile2
-rw-r--r--docker/smoke/Dockerfile2
6 files changed, 8 insertions, 8 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 4bc06efc..0ad5b0bd 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-smoke
+FROM opnfv/functest-kubernetes-smoke:v1.25
ARG NETPERF_TAG=master
ARG PLOTPERF_TAG=master
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index eafebba9..9eaae4d4 100644
--- a/docker/cnf/Dockerfile
+++ b/docker/cnf/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:v1.25
ARG K8S_TAG=1.25
ARG CNF_TESTSUITE_TAG=v0.15.0
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 24354cea..e0459ff0 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,8 +1,8 @@
FROM alpine:3.15
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
-ARG OPNFV_TAG=master
+ARG BRANCH=stable/v1.25
+ARG OPENSTACK_TAG=stable/yoga
+ARG OPNFV_TAG=stable/yoga
COPY Try-a-quick-fix-vs-asynchronuous-issues.patch /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch
COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 6c514901..07280684 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:v1.25
ARG K8S_TAG=1.25
RUN apk --no-cache add --update curl libc6-compat && \
diff --git a/docker/security/Dockerfile b/docker/security/Dockerfile
index 5ecdc9bd..5a553e58 100644
--- a/docker/security/Dockerfile
+++ b/docker/security/Dockerfile
@@ -1,3 +1,3 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:v1.25
COPY testcases.yaml /etc/xtesting/testcases.yaml
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 1ae498dc..0aa7a976 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-healthcheck
+FROM opnfv/functest-kubernetes-healthcheck:v1.25
COPY testcases.yaml /etc/xtesting/testcases.yaml
CMD ["run_tests", "-t", "all"]