build: Add suffix to OCI image tag for GCC build

This commit introduces optional suffixes to the name of the OCI image names which are added during the CI/CD pipelines to uniquely identify PRs as well as the auxilary non-stable branches, such as `staging`. With this suffix, we can inject and reference a bespoke OCI image. Signed-off-by: Alexander Jung <[email protected]>
unikraft · Nov 7, 2021 · b371f18 · b371f18
1 parent 073de4b
commit b371f18
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.concourse/templates/staging.yml b/.concourse/templates/staging.yml
@@ -238,6 +238,7 @@ jobs:
                   kraft: #@ "kraft-{}".format(branch)
                 params:
                   TARGET: kraft
+                  BUILD_ARG_GCC_SUFFIX: -staging
                   BUILD_ARG_GCC_VERSION: #@ versions.gcc
 
               - load_var: docker-kraft-digest
@@ -259,6 +260,7 @@ jobs:
                   kraft: #@ "kraft-{}".format(branch)
                 params:
                   TARGET: kraft-dev
+                  BUILD_ARG_GCC_SUFFIX: -staging
                   BUILD_ARG_GCC_VERSION: #@ versions.gcc
 
               - load_var: docker-kraft-dev-digest

diff --git a/package/docker/Dockerfile.kraft b/package/docker/Dockerfile.kraft
@@ -31,12 +31,13 @@
 
 ARG UK_ARCH=x86_64
 ARG GCC_VERSION=9.2.0
+ARG GCC_SUFFIX=
 ARG QEMU_VERSION=4.2.0
 
-FROM unikraft/gcc:${GCC_VERSION}-x86_64 AS gcc-x86_64
-FROM unikraft/gcc:${GCC_VERSION}-arm    AS gcc-arm
-FROM unikraft/gcc:${GCC_VERSION}-arm64  AS gcc-arm64
-FROM unikraft/qemu:${QEMU_VERSION}      AS qemu
+FROM unikraft/gcc:${GCC_VERSION}-x86_64${GCC_SUFFIX} AS gcc-x86_64
+FROM unikraft/gcc:${GCC_VERSION}-arm${GCC_SUFFIX}    AS gcc-arm
+FROM unikraft/gcc:${GCC_VERSION}-arm64${GCC_SUFFIX}  AS gcc-arm64
+FROM unikraft/qemu:${QEMU_VERSION}                   AS qemu
 
 LABEL MAINTAINER="Alexander Jung <[email protected]>"