From 04b3972a5844e565c4af611deaf88089e5bca21a Mon Sep 17 00:00:00 2001
From: Erik Appel <erik@appel.cloud>
Date: Sat, 18 Mar 2023 01:36:23 +0100
Subject: [PATCH] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 30 ++++++++++++++++++++++++------
1 file changed, 24 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97868cf..75e74cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,26 @@
-build:
- image: gitlab-registry.warpzone.ms/nandxor/fridge-audioserver
- services:
- - name: gitlab-registry.warpzone.ms/nandxor/fridge-audioserver
- alias: docker
+docker-build:
+ # Use the official docker image.
+ image: docker:latest
stage: build
+ services:
+ - docker:dind
+ before_script:
+ - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+ # Default branch leaves tag empty (= latest tag)
+ # All other branches are tagged with the escaped branch name (commit ref slug)
script:
- - docker build -t gitlab-registry.warpzone.ms/nandxor/fridge-audioserver .
+ - |
+ if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
+ tag=""
+ echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
+ else
+ tag=":$CI_COMMIT_REF_SLUG"
+ echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
+ fi
+ - docker build -t "$CI_REGISTRY_IMAGE${tag}" .
+ - docker push "$CI_REGISTRY_IMAGE${tag}"
+ # Run this job in a branch where a Dockerfile exists
+ rules:
+ - if: $CI_COMMIT_BRANCH
+ exists:
+ - Dockerfile
--
GitLab