ci: Extend build args

.gitlab-ci.yml

@@ -12,29 +12,43 @@ test amd64:
   variables:
     project_name: $CI_PROJECT_NAME
     SEMANTIC_RELEASE_PACKAGE: $CI_PROJECT_NAME
+    FOCAL_RELEASE_DATE: "current"
+    OVERLAY_VERSION: "v2.2.0.3"
   before_script:
     - docker login -u "$DOCKERHUB_USER" -p "$DOCKERHUB_TOKEN" docker.io
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker build -t "$CI_REGISTRY_IMAGE:amd64-develop" -t "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-develop"
+    - docker build
+      --tag "$CI_REGISTRY_IMAGE:amd64-develop"
+      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-develop"
+      --build-arg FOCAL_ARCH=amd64
+      --build-arg FOCAL_RELEASE_DATE="$FOCAL_RELEASE_DATE"
       --build-arg BUILD_DATE="$CI_PIPELINE_CREATED_AT"
       --build-arg VERSION="$CI_COMMIT_SHORT_SHA"
-      --build-arg OVERLAY_ARCH="amd64"
-      --build-arg FETCH=amd64/ .
+      --build-arg OVERLAY_VERSION="$OVERLAY_VERSION"
+      --build-arg OVERLAY_ARCH=amd64 .
     - docker push "$CI_REGISTRY_IMAGE:amd64-develop"
     - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-develop"
-    - docker build -t "$CI_REGISTRY_IMAGE:armhf-develop" -t "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-develop"
+    - docker build
+      --tag "$CI_REGISTRY_IMAGE:armhf-develop"
+      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-develop"
+      --build-arg FOCAL_ARCH=armhf
+      --build-arg FOCAL_RELEASE_DATE="$FOCAL_RELEASE_DATE"
       --build-arg BUILD_DATE="$CI_PIPELINE_CREATED_AT"
       --build-arg VERSION="$CI_COMMIT_SHORT_SHA"
-      --build-arg OVERLAY_ARCH="arm"
-      --build-arg FETCH=armhf/ .
+      --build-arg OVERLAY_VERSION="$OVERLAY_VERSION"
+      --build-arg OVERLAY_ARCH=arm .
     - docker push "$CI_REGISTRY_IMAGE:armhf-develop"
     - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-develop"
-    - docker build -t "$CI_REGISTRY_IMAGE:arm64-develop" -t "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-develop"
+    - docker build
+      --tag "$CI_REGISTRY_IMAGE:arm64-develop"
+      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-develop"
+      --build-arg FOCAL_ARCH=arm64
+      --build-arg FOCAL_RELEASE_DATE="$FOCAL_RELEASE_DATE"
       --build-arg BUILD_DATE="$CI_PIPELINE_CREATED_AT"
       --build-arg VERSION="$CI_COMMIT_SHORT_SHA"
-      --build-arg OVERLAY_ARCH="aarch64"
-      --build-arg FETCH=arm64/ .
+      --build-arg OVERLAY_VERSION="$OVERLAY_VERSION"
+      --build-arg OVERLAY_ARCH=aarch64 .
     - docker push "$CI_REGISTRY_IMAGE:arm64-develop"
     - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-develop"
     - docker manifest create "$CI_REGISTRY_IMAGE:develop"
@@ -82,33 +96,53 @@ build:
   variables:
     project_name: $CI_PROJECT_NAME
     SEMANTIC_RELEASE_PACKAGE: $CI_PROJECT_NAME
+    FOCAL_RELEASE_DATE: "current"
+    OVERLAY_VERSION: "v2.2.0.3"
   before_script:
     - docker login -u "$DOCKERHUB_USER" -p "$DOCKERHUB_TOKEN" docker.io
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker build -t "$CI_REGISTRY_IMAGE:amd64-latest" -t "$CI_REGISTRY_IMAGE:amd64-$CI_COMMIT_TAG" -t "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-latest" -t "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-$CI_COMMIT_TAG"
+    - docker build
+      --tag "$CI_REGISTRY_IMAGE:amd64-latest"
+      --tag "$CI_REGISTRY_IMAGE:amd64-$CI_COMMIT_TAG"
+      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-latest"
+      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-$CI_COMMIT_TAG"
+      --build-arg FOCAL_ARCH=amd64
+      --build-arg FOCAL_RELEASE_DATE="$FOCAL_RELEASE_DATE"
       --build-arg BUILD_DATE="$CI_PIPELINE_CREATED_AT"
       --build-arg VERSION="$CI_COMMIT_TAG"
-      --build-arg OVERLAY_ARCH="amd64"
-      --build-arg FETCH=amd64/ .
+      --build-arg OVERLAY_VERSION="$OVERLAY_VERSION"
+      --build-arg OVERLAY_ARCH=amd64 .
     - docker push "$CI_REGISTRY_IMAGE:amd64-latest"
     - docker push "$CI_REGISTRY_IMAGE:amd64-$CI_COMMIT_TAG"
     - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-latest"
     - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-$CI_COMMIT_TAG"
-    - docker build -t "$CI_REGISTRY_IMAGE:armhf-latest" -t "$CI_REGISTRY_IMAGE:armhf-$CI_COMMIT_TAG" -t "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-latest" -t "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-$CI_COMMIT_TAG"
+    - docker build
+      --tag "$CI_REGISTRY_IMAGE:armhf-latest"
+      --tag "$CI_REGISTRY_IMAGE:armhf-$CI_COMMIT_TAG"
+      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-latest"
+      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-$CI_COMMIT_TAG"
+      --build-arg FOCAL_ARCH=armhf
+      --build-arg FOCAL_RELEASE_DATE="$FOCAL_RELEASE_DATE"
       --build-arg BUILD_DATE="$CI_PIPELINE_CREATED_AT"
       --build-arg VERSION="$CI_COMMIT_TAG"
-      --build-arg OVERLAY_ARCH="arm"
-      --build-arg FETCH=armhf/ .
+      --build-arg OVERLAY_VERSION="$OVERLAY_VERSION"
+      --build-arg OVERLAY_ARCH=arm .
     - docker push "$CI_REGISTRY_IMAGE:armhf-latest"
     - docker push "$CI_REGISTRY_IMAGE:armhf-$CI_COMMIT_TAG"
     - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-latest"
     - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-$CI_COMMIT_TAG"
-    - docker build -t "$CI_REGISTRY_IMAGE:arm64-latest" -t "$CI_REGISTRY_IMAGE:arm64-$CI_COMMIT_TAG" -t "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-latest" -t "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-$CI_COMMIT_TAG"
+    - docker build
+      --tag "$CI_REGISTRY_IMAGE:arm64-latest"
+      --tag "$CI_REGISTRY_IMAGE:arm64-$CI_COMMIT_TAG"
+      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-latest"
+      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-$CI_COMMIT_TAG"
+      --build-arg FOCAL_ARCH=arm64
+      --build-arg FOCAL_RELEASE_DATE="$FOCAL_RELEASE_DATE"
       --build-arg BUILD_DATE="$CI_PIPELINE_CREATED_AT"
       --build-arg VERSION="$CI_COMMIT_TAG"
-      --build-arg OVERLAY_ARCH="aarch64"
-      --build-arg FETCH=arm64/ .
+      --build-arg OVERLAY_VERSION="$OVERLAY_VERSION"
+      --build-arg OVERLAY_ARCH="aarch64" .
     - docker push "$CI_REGISTRY_IMAGE:arm64-latest"
     - docker push "$CI_REGISTRY_IMAGE:arm64-$CI_COMMIT_TAG"
     - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-latest"