From 191d18984469e4485ebc28aae0de3fe0bc1240b3 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 3 Dec 2018 12:21:21 +0100
Subject: [PATCH] Remove version build-arg use default of dockerfile instead

Signed-off-by: solidnerd <niclas@mietz.io>
---
 .circleci/config.yml | 1 -
 .gitlab-ci.yml       | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6b81234e..d9ff09bd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,7 +59,6 @@ jobs:
               --cache-from=${IMAGE_NAME} \
               --build-arg BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \
               --build-arg VCS_REF=$(git rev-parse --short HEAD) \
-              --build-arg VERSION=$(cat VERSION) \
               -t ${IMAGE_NAME}:$(cat VERSION) .
 
       - run:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e8d57ad..675b0495 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,6 @@ docker:build:
       --cache-from=${DOCKER_IMAGE}
       --build-arg=VCS_REF=$(git rev-parse --short HEAD)
       --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")"
-      --build-arg=VERSION=${VERSION}
       --tag ${DOCKER_IMAGE} .
     - docker push ${DOCKER_IMAGE}
 
@@ -42,7 +41,6 @@ docker:build:branches:
       --cache-from=${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG}
       --build-arg=VCS_REF=$(git rev-parse --short HEAD)
       --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")"
-      --build-arg=VERSION=${VERSION}
       --tag ${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG} .
     - docker push ${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG}
 
@@ -57,6 +55,5 @@ docker:build:release:
       --cache-from=${DOCKER_IMAGE}:${VERSION}
       --build-arg=VCS_REF=$(git rev-parse --short HEAD)
       --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")"
-      --build-arg=VERSION=${VERSION}
       --tag ${DOCKER_IMAGE}:${VERSION} .
     - docker push ${DOCKER_IMAGE}:${VERSION}