Merge pull request #252 from munnerz/automated-cherry-pick-of-#251-up…

…stream-release-0.2

Automated cherry pick of #251

.gitlab-ci.yml

@@ -8,7 +8,11 @@ services:
 - docker:1.12-dind
 
 before_script:
-  - apk --update add make docker bash curl
+  # Install docker
+  # Note: 1.11+ changes the tarball format
+  - curl -L "https://get.docker.com/builds/Linux/x86_64/docker-1.9.1.tgz" | tar -C /usr/bin -xvzf- --strip-components=3 usr/local/bin/docker
+  - apt-get update
+  - apt-get install -y make curl
   - export DOCKER_HOST=${DOCKER_PORT}
   - docker info > /dev/null
   - mkdir -p "${GOPATH}/src/${PKG_PATH}" && rmdir "${GOPATH}/src/${PKG_PATH}"
@@ -25,7 +29,7 @@ build:
   tags:
   - docker
   script:
-  - make all image
+  - make verify build
   except:
   - master
   - tags
@@ -35,7 +39,7 @@ master_push:
   - docker
   script:
   - mkdir -p ~/.docker && echo "${DOCKER_AUTH_CONFIG}" > ~/.docker/config.json && chmod 600 ~/.docker/config.json
-  - make verify push IMAGE_TAGS="${CI_BUILD_REF_SLUG}-${CI_PIPELINE_ID} canary"
+  - make verify build push IMAGE_TAGS="${CI_BUILD_REF_SLUG}-${CI_PIPELINE_ID} canary"
   only:
   - master
 
@@ -44,6 +48,6 @@ release_push:
   - docker
   script:
   - mkdir -p ~/.docker && echo "${DOCKER_AUTH_CONFIG}" > ~/.docker/config.json && chmod 600 ~/.docker/config.json
-  - APP_VERSION=${CI_COMMIT_TAG} make verify push IMAGE_TAGS="${CI_COMMIT_TAG} latest"
+  - APP_VERSION=${CI_COMMIT_TAG} make verify build push IMAGE_TAGS="${CI_COMMIT_TAG} latest"
   only:
   - tags