ci: adjust build arguments (#2772)

The build arguments `VCS_REF` and `VCS_VER` were renamed and given
proper values according to their names.

1. `VCS_REVISION` holds the current SHA sum of the (git) HEAD pointer
2. `VCS_VERSION` now holds the contents of the `VERSION` file, i.e. a
   semver version tag (one can now inspect the image and find a proper
   version tag in the `org.opencontainers.image.version` label)

The build arguments were given defaults in order to allow the
`generic_build` and `generic_test` workflows to omit them (as they are
not need there anyways). When publishing images, this is fina as the
cache will rebuild almost all of the image except the last few layers
which are `LABEL`s anyways.
This commit is contained in:
Georg Lauterbach 2022-09-16 19:23:33 +02:00 committed by GitHub
parent f8e1bb0f42
commit 6113b99881
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 16 deletions

View file

@ -1,8 +1,8 @@
SHELL = /bin/bash
NAME ?= mailserver-testing:ci
VCS_REF = $(shell git rev-parse --short HEAD)
VCS_VER = $(shell git describe --tags --contains --always)
NAME ?= mailserver-testing:ci
VCS_REVISION = $(shell git rev-parse --short HEAD)
VCS_VERSION = $(shell cat VERSION)
# -----------------------------------------------
# --- Generic Build Targets ---------------------
@ -11,7 +11,7 @@ VCS_VER = $(shell git describe --tags --contains --always)
all: lint build backup generate-accounts tests clean
build:
docker build -t $(NAME) . --build-arg VCS_VER=$(VCS_VER) --build-arg VCS_REF=$(VCS_REF)
docker build -t $(NAME) . --build-arg VCS_VERSION=$(VCS_VERSION) --build-arg VCS_REVISION=$(VCS_REVISION)
backup:
# if backup directory exist, clean hasn't been called, therefore