From 22ffe283622fd4c05966147b2625a5c586671961 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Sun, 12 Jan 2020 13:06:31 +0100
Subject: [PATCH] Add version to the images again
---
.gitlab-ci.yml | 11 +++++++----
Dockerfile | 1 +
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a79bda0..f0720c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,13 @@
+variables:
+ VERSION: ${CI_COMMIT_TAG}
+
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
#php-7.0:
# stage: build
# script:
-# - docker build --pull --build-arg ALPINE_VERSION=3.5 --build-arg PHP_VERSION=7.0 -t $CI_REGISTRY_IMAGE:php-7.0 .
+# - docker build --pull --build-arg ALPINE_VERSION=3.5 --build-arg PHP_VERSION=7.0 --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-7.0 .
# - docker push $CI_REGISTRY_IMAGE:php-7.0
# only:
# - master
@@ -12,7 +15,7 @@ before_script:
#php-7.1:
# stage: build
# script:
-# - docker build --pull --build-arg ALPINE_VERSION=3.7 --build-arg PHP_VERSION=7.1 -t $CI_REGISTRY_IMAGE:php-7.1 .
+# - docker build --pull --build-arg ALPINE_VERSION=3.7 --build-arg PHP_VERSION=7.1 --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-7.1 .
# - docker push $CI_REGISTRY_IMAGE:php-7.1
# only:
# - master
@@ -20,7 +23,7 @@ before_script:
php-7.2:
stage: build
script:
- - docker build --pull --build-arg ALPINE_VERSION=3.8 --build-arg PHP_VERSION=7.2 -t $CI_REGISTRY_IMAGE:php-7.2 .
+ - docker build --pull --build-arg ALPINE_VERSION=3.8 --build-arg PHP_VERSION=7.2 --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-7.2 .
- docker push $CI_REGISTRY_IMAGE:php-7.2
only:
- master
@@ -28,7 +31,7 @@ php-7.2:
php-7.3:
stage: build
script:
- - docker build --pull --build-arg ALPINE_VERSION=3.11 --build-arg PHP_VERSION=7.3 -t $CI_REGISTRY_IMAGE:php-7.3 .
+ - docker build --pull --build-arg ALPINE_VERSION=3.11 --build-arg PHP_VERSION=7.3 --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-7.3 .
- docker push $CI_REGISTRY_IMAGE:php-7.3
only:
- master
diff --git a/Dockerfile b/Dockerfile
index 4213350..f71c944 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ FROM alpine:${ALPINE_VERSION}
LABEL com.example.vendor="LakeDrops" \
maintainer="juergen.haas@lakedrops.com" \
+ version="${VERSION}" \
description="An image for GitLab runner to build and test Drupal projects."
ARG ALPINE_VERSION
--
GitLab