aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-09-13 09:41:19 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-09-13 09:41:19 +0200
commitc28cfec632b47e1c631fd100abbc759a1a2e3489 (patch)
treea33f84915000ce585d262707440e253b42131233 /docker
parentca3c9cf6f57c87aee8c6f0b93f70d84e3df736de (diff)
Update to OpenStack master
Change-Id: I894bb969d690537f6910b8cfcdb52162747121a6 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--docker/features/Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 5150c393..121fc0aa 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
FROM alpine:3.8
ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/queens
+ARG OPENSTACK_TAG=master
ARG OPNFV_TAG=master
RUN apk --no-cache add --update python py-pip bash git grep && \
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 9b626d3b..d8b1ae98 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -1,6 +1,6 @@
FROM opnfv/functest-kubernetes-core
-ARG OPENSTACK_TAG=stable/queens
+ARG OPENSTACK_TAG=master
ARG OPNFV_TAG=master
RUN apk --no-cache add --update make py-pip bash git go \