From 2e97eaa2fb11380949b9948fa6baa81742c47543 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Thu, 29 Aug 2019 09:06:47 +0000
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 42 +++---------------------------------------
1 file changed, 3 insertions(+), 39 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 206982d..e45fadb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,6 @@
+variables:
+ DOCKER_HOST: tcp://docker-dind.gitlab:2375
+
stages:
- prepare
- build
@@ -36,43 +39,4 @@ prepare_composer:
- vendor
build:
- stage: build
- image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image/master:stable"
- variables:
- DOCKER_TLS_CERTDIR: ""
services:
- - docker:stable-dind
- script:
- - |
- if [[ -z "$CI_COMMIT_TAG" ]]; then
- export CI_APPLICATION_REPOSITORY=${CI_APPLICATION_REPOSITORY:-$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG}
- export CI_APPLICATION_TAG=${CI_APPLICATION_TAG:-$CI_COMMIT_SHA}
- else
- export CI_APPLICATION_REPOSITORY=${CI_APPLICATION_REPOSITORY:-$CI_REGISTRY_IMAGE}
- export CI_APPLICATION_TAG=${CI_APPLICATION_TAG:-$CI_COMMIT_TAG}
- fi
- - |
- if ! docker info &>/dev/null; then
- export DOCKER_HOST='tcp://docker-dind.gitlab:2375'
- fi
- - |
- if [[ -n "$CI_REGISTRY" && -n "$CI_REGISTRY_USER" ]]; then
- echo "Logging to GitLab Container Registry with CI credentials..."
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
- fi
- - |
- if [[ -f Dockerfile ]]; then
- echo "Building Dockerfile-based application..."
- else
- echo "Building Heroku-based application using gliderlabs/herokuish docker image..."
- cp /build/Dockerfile Dockerfile
- fi
- # shellcheck disable=SC2154 # missing variable warning for the lowercase variables
- # shellcheck disable=SC2086 # double quoting for globbing warning for $AUTO_DEVOPS_BUILD_IMAGE_EXTRA_ARGS
- - docker pull $CI_APPLICATION_REPOSITORY:latest
- - docker build --cache-from $CI_REGISTRY_IMAGE:latest --build-arg BUILDPACK_URL="$BUILDPACK_URL" --build-arg HTTP_PROXY="$HTTP_PROXY" --build-arg http_proxy="$http_proxy" --build-arg HTTPS_PROXY="$HTTPS_PROXY" --build-arg https_proxy="$https_proxy" --build-arg FTP_PROXY="$FTP_PROXY" --build-arg ftp_proxy="$ftp_proxy" --build-arg NO_PROXY="$NO_PROXY" --build-arg no_proxy="$no_proxy" $AUTO_DEVOPS_BUILD_IMAGE_EXTRA_ARGS --tag "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG" --tag "$CI_APPLICATION_REPOSITORY:latest" .
- - docker push "$CI_APPLICATION_REPOSITORY:latest"
- - docker push "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG"
- only:
- - branches
- - tags
--
GitLab