From 3b9f66d8b4b9d730b85129a50e269fe4322611bf Mon Sep 17 00:00:00 2001
From: Jono Hill <jonathan@hillnz.com>
Date: Tue, 23 Jul 2019 21:14:07 +1200
Subject: [PATCH] Run push in the new image

---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27e1e52..2dba94e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,10 +8,11 @@ variables:
 
 dockerhub-push:
   stage: deploy
+  image: "$CI_REGISTRY_IMAGE"
   script:
     - echo "$DOCKERHUB_PASSWORD" | base64 -d | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
-    - export DOCKER_VERSION=$(docker run --rm "$CI_REGISTRY_IMAGE" docker --version | perl -pe 's/^.*\s(\d+\.\d+\.\d+.+),.*$/\1/')
-    - export BUILDX_VERSION=$(docker run --rm "$CI_REGISTRY_IMAGE" docker buildx version | perl -pe 's/^.*v?(\d+\.\d+\.\d+).*$/$1/')
+    - export DOCKER_VERSION=$(docker --version | perl -pe 's/^.*\s(\d+\.\d+\.\d+.+),.*$/\1/')
+    - export BUILDX_VERSION=$(docker buildx version | perl -pe 's/^.*v?(\d+\.\d+\.\d+).*$/$1/')
     - docker tag "$CI_REGISTRY_IMAGE" "$DOCKERHUB_REPO:latest"
     - docker tag "$CI_REGISTRY_IMAGE" "$DOCKERHUB_REPO:${DOCKER_VERSION}_${BUILDX_VERSION}"
     - docker push "$DOCKERHUB_REPO"