From 706e722c6f3bcf84ab7ebbf5714b7d61427282df Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 3 Nov 2019 07:20:32 +0100 Subject: [PATCH] Fix environment variables. --- .deploy/docker/manifest.sh | 2 -- .travis.yml | 12 ++++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.deploy/docker/manifest.sh b/.deploy/docker/manifest.sh index a607ab5def..bf7c8cfdce 100755 --- a/.deploy/docker/manifest.sh +++ b/.deploy/docker/manifest.sh @@ -5,8 +5,6 @@ mkdir $HOME/.docker touch $HOME/.docker/config.json echo '{"experimental":"enabled"}' | sudo tee $HOME/.docker/config.json sudo service docker restart -docker version -f '{{.Server.Experimental}}' -docker version echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin diff --git a/.travis.yml b/.travis.yml index 27a78053aa..3426f09b9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,29 +10,25 @@ branches: services: - docker -env: - - VERSION=4.8.2 - - CHANNEL=stable - - jobs: include: - dist: xenial arch: amd64 - env: ARCH=amd64 + env: ARCH=amd64 CHANNEL=stable VERSION=4.8.2 stage: build script: ./.deploy/docker/travis.sh - dist: xenial arch: amd64 - env: ARCH=arm + env: ARCH=arm CHANNEL=stable VERSION=4.8.2 stage: build script: ./.deploy/docker/travis.sh - dist: xenial arch: arm64 - env: ARCH=arm64 + env: ARCH=arm64 CHANNEL=stable VERSION=4.8.2 stage: build script: ./.deploy/docker/travis.sh - dist: xenial arch: amd64 + env: CHANNEL=stable VERSION=4.8.2 stage: manifest script: ./.deploy/docker/manifest.sh \ No newline at end of file