From 58ec0c4add4cef2377bc34fa340a98a1db89556a Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Nov 2019 07:19:12 +0100
Subject: [PATCH] Change some environment variables for easier handling.

---
 .deploy/docker/travis.sh |  5 ++---
 .travis.yml              | 11 ++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.deploy/docker/travis.sh b/.deploy/docker/travis.sh
index d3ff270048..a61a13ecd6 100755
--- a/.deploy/docker/travis.sh
+++ b/.deploy/docker/travis.sh
@@ -1,13 +1,12 @@
 #!/usr/bin/env bash
 
-echo $TRAVIS_DIST
+echo "I am building channel ${CHANNEL} for version ${VERSION} on architecture ${ARCH}."
+
 echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
 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
 
 # build everything
 .deploy/docker/build-$ARCH.sh
diff --git a/.travis.yml b/.travis.yml
index 4fde4e2871..27a78053aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,21 +10,26 @@ branches:
 services:
   - docker
 
+env:
+  - VERSION=4.8.2
+  - CHANNEL=stable
+
+
 jobs:
   include:
     - dist: xenial
       arch: amd64
-      env: ARCH=amd64 VERSION=4.8.2
+      env: ARCH=amd64
       stage: build
       script: ./.deploy/docker/travis.sh
     - dist: xenial
       arch: amd64
-      env: ARCH=arm VERSION=4.8.2
+      env: ARCH=arm
       stage: build
       script: ./.deploy/docker/travis.sh
     - dist: xenial
       arch: arm64
-      env: ARCH=arm64 VERSION=4.8.2
+      env: ARCH=arm64
       stage: build
       script: ./.deploy/docker/travis.sh
     - dist: xenial