diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-09-13 09:41:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-13 09:41:59 +0000 |
| commit | 6fda20c0f122ab25d5034a7365a116fcc58044d9 (patch) | |
| tree | cb676cb82055314700196b41c835d35640567a61 | |
| parent | 7d48c511445c147bd81134005006e09dba6bd820 (diff) | |
| parent | 0392aa3f439a5ef4cdda3f30e3418612ddbdef6e (diff) | |
Merge changes I83c64de0,Ifa520a21 into stable/gambia
* changes:
Update .travis.yml
Fix BRANCH in Dockerfile
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | docker/Dockerfile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 36f1969a..0550338e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,5 +24,5 @@ jobs: script: > sudo manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${DOCKER_USERNAME}/xtesting:ARCH-latest \ - --target ${DOCKER_USERNAME}/xtesting:latest + --template ${DOCKER_USERNAME}/xtesting:ARCH-gambia \ + --target ${DOCKER_USERNAME}/xtesting:gambia diff --git a/docker/Dockerfile b/docker/Dockerfile index 87a59c34..32af8435 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ARG BRANCH=master +ARG BRANCH=stable/gambia ARG OPENSTACK_TAG=stable/queens RUN apk --no-cache add --update python py-pip bash git && \ |