From 6a5f5f82cf4c63c4b0489ebc5cb72f69cd897dc7 Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <manuel.kieweg@h-da.de>
Date: Mon, 29 Mar 2021 15:46:55 +0100
Subject: [PATCH] change build args
---
build/ci/.build-container.yml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/build/ci/.build-container.yml b/build/ci/.build-container.yml
index 570917e7f..b08fe7d84 100644
--- a/build/ci/.build-container.yml
+++ b/build/ci/.build-container.yml
@@ -18,7 +18,7 @@ variables:
docker build \
--build-arg GITLAB_USER=$GO_MODULES_USER \
--build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN \
- -t $DOCKER_IMAGE_SHA $DOCKERFILE
+ -t $DOCKER_IMAGE_SHA .
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker tag $DOCKER_IMAGE_SHA $TAG
- docker push $TAG
@@ -27,7 +27,6 @@ build:develop:
variables:
TAG: $CI_REGISTRY_IMAGE:develop
BUILDARGS: -race
- DOCKERFILE: build/dockerfiles/staging
rules:
- if: $CI_COMMIT_BRANCH == "develop"
<<: *build
@@ -36,7 +35,6 @@ build:merge-request:
variables:
TAG: $CI_REGISTRY_IMAGE:merge-request
BUILDARGS: -race
- DOCKERFILE: build/dockerfiles/staging
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
<<: *build
@@ -44,7 +42,6 @@ build:merge-request:
build:latest:
variables:
TAG: $CI_REGISTRY_IMAGE:latest
- DOCKERFILE: build/dockerfiles/production
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
<<: *build
\ No newline at end of file
--
GitLab