summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/core/Dockerfile8
-rw-r--r--docker/features/Dockerfile6
-rw-r--r--docker/healthcheck/Dockerfile4
-rw-r--r--docker/smoke/Dockerfile2
4 files changed, 10 insertions, 10 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index c84861e9..199295c8 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,8 +1,8 @@
-FROM golang:alpine3.9
+FROM golang:1.12.1-alpine3.9
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
-ARG OPNFV_TAG=master
+ARG BRANCH=stable/iruya
+ARG OPENSTACK_TAG=stable/stein
+ARG OPNFV_TAG=stable/iruya
RUN apk --no-cache add --update python py-pip bash git grep && \
apk --no-cache add --virtual .build-deps --update \
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 16712ab5..9e1123ba 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -1,7 +1,7 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:iruya
-ARG OPENSTACK_TAG=master
-ARG OPNFV_TAG=master
+ARG OPENSTACK_TAG=stable/stein
+ARG OPNFV_TAG=stable/iruya
COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --update make py-pip bash git go \
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index bafc3c4d..74d2aa27 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:iruya
-ARG K8S_TAG=master
+ARG K8S_TAG=v1.13.5
RUN apk --no-cache add --update make py-pip bash git \
grep rsync linux-headers musl-dev findutils \
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 137cc16b..3868b278 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-healthcheck
+FROM opnfv/functest-kubernetes-healthcheck:iruya
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]