Merge remote-tracking branch 'origin/master' into Release_2.1

.gitlab-ci.yml

@@ -5,21 +5,23 @@ stages:
   - build
 
 
-# CentOS/RHEL
+# Debian
 
-centos8:build:
+debian10:build:
   extends: .make_in_docker
   stage: build
   variables:
-    CI_MAKE_TARGET: libpepadapter
-    CI_DISTRO_TARGET: centos8
+    CI_DISTRO_TARGET: "debian10"
+    DEBIAN_FRONTEND: "noninteractive"
+  rules:
+    - if: '$CI_COMMIT_TAG  !~ /^Release_[0-9]+\.[0-9]+\.[0-9]+$/'
 
-# Debian
-
-debian10:build:
+debian10:tagged-build:
   extends: .make_in_docker
   stage: build
   variables:
-    CI_MAKE_TARGET: libpepadapter
-    CI_DISTRO_TARGET: debian10
-    DEBIAN_FRONTEND: noninteractive
+    CI_DISTRO_TARGET: "debian10"
+    DEBIAN_FRONTEND: "noninteractive"
+    TAGGED_BUILD: "true"
+  rules:
+    - if: '$CI_COMMIT_TAG  =~ /^Release_[0-9]+\.[0-9]+\.[0-9]+$/'

DEPENDENCIES

@@ -0,0 +1,5 @@
+# 1st Party Dependencies
+## Prefer git tags instead of SHA hashes when possible.
+
+pEpEngine=Release_2.1.13
+sequoia=365d00a08bec6a5a48d48a7c7893d78c27092b59

scripts/debian10/Makefile

@@ -1,15 +1,27 @@
+include ../../DEPENDENCIES
+export
+PEPENGINE_VERSION=${pEpEngine}
 CURRENT_DISTRO=$(shell basename $(shell pwd))
-LIBPEPADAPTER_VERSION=$(shell git rev-parse --short=8 HEAD)
 IMAGE_NAME=${DOCKER_REGISTRY_HOST}/pep-$(CURRENT_DISTRO)-libpepadapter
 DOCKERFILE=libpEpAdapter.$(CURRENT_DISTRO).Dockerfile
+IS_TAGGED=${TAGGED_BUILD}
+ifeq ($(IS_TAGGED), true)
+# $CI_COMMIT_TAG is a predefined environment variable from Gitlab
+	LIBPEPADAPTER_VERSION=${CI_COMMIT_TAG}
+else
+	LIBPEPADAPTER_VERSION=$(shell git rev-parse --short=8 HEAD)
+endif
 all:
 	-docker pull $(IMAGE_NAME):latest
 	cd ../../ && docker build --build-arg CURRENT_DISTRO=$(CURRENT_DISTRO) \
 		      --build-arg DOCKER_REGISTRY_HOST=${DOCKER_REGISTRY_HOST} \
+		      --build-arg PEPENGINE_VERSION=$(PEPENGINE_VERSION) \
 		      --build-arg LIBPEPADAPTER_VERSION=$(LIBPEPADAPTER_VERSION) \
 		      --cache-from $(IMAGE_NAME):latest \
 		      --tag=$(IMAGE_NAME):$(LIBPEPADAPTER_VERSION) \
+		      --tag=$(IMAGE_NAME):${LIBPEPADAPTER_VERSION}_engine-${PEPENGINE_VERSION} \
 		      --tag=$(IMAGE_NAME):latest \
 		      -f scripts/${CURRENT_DISTRO}/$(DOCKERFILE) .
 	docker push $(IMAGE_NAME):${LIBPEPADAPTER_VERSION}
+	docker push $(IMAGE_NAME):${LIBPEPADAPTER_VERSION}_engine-${PEPENGINE_VERSION}
 	docker push $(IMAGE_NAME):latest