From f4582c8a39705bc656ccf398a5ecc02df3d1be2a Mon Sep 17 00:00:00 2001
From: Ameer Hamza <hello@ahkhan.me>
Date: Wed, 22 Mar 2023 00:08:17 +0800
Subject: [PATCH] Simplified tagging. Added option for build caching. The cache
 is stored on the registry along the images.

---
 build_command.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/build_command.sh b/build_command.sh
index 15a3e5b..d81ac1f 100644
--- a/build_command.sh
+++ b/build_command.sh
@@ -13,20 +13,24 @@ then
     docker buildx build . \
         -f Dockerfile \
         --build-arg UBUNTU_VER=$UBUNTU_VER \
-        -t $CI_REGISTRY/docker/$CI_PROJECT_NAME/ubuntu-$UBUNTU_VER:`date "+%Y-%m-%d"` \
-        -t $CI_REGISTRY/docker/$CI_PROJECT_NAME/ubuntu-$UBUNTU_VER:latest \
-        -t $CI_REGISTRY/docker/$CI_PROJECT_NAME:$UBUNTU_VER \
+        -t $CI_REGISTRY_IMAGE/ubuntu-$UBUNTU_VER:`date "+%Y-%m-%d"` \
+        -t $CI_REGISTRY_IMAGE/ubuntu-$UBUNTU_VER:latest \
+        -t $CI_REGISTRY_IMAGE:$UBUNTU_VER \
         --platform $PLATFORMS \
+        --cache-from $CI_REGISTRY_IMAGE/ubuntu-$UBUNTU_VER:cache \
+        --cache-to $CI_REGISTRY_IMAGE/ubuntu-$UBUNTU_VER:cache \
         --push --provenance false
 else
     docker buildx build . \
         -f Dockerfile \
         --build-arg UBUNTU_VER=$UBUNTU_VER \
-        -t $CI_REGISTRY/docker/$CI_PROJECT_NAME/ubuntu-$UBUNTU_VER:`date "+%Y-%m-%d"` \
-        -t $CI_REGISTRY/docker/$CI_PROJECT_NAME/ubuntu-$UBUNTU_VER:latest \
-        -t $CI_REGISTRY/docker/$CI_PROJECT_NAME:$UBUNTU_VER \
-        -t $CI_REGISTRY/docker/$CI_PROJECT_NAME:latest \
+        -t $CI_REGISTRY_IMAGE/ubuntu-$UBUNTU_VER:`date "+%Y-%m-%d"` \
+        -t $CI_REGISTRY_IMAGE/ubuntu-$UBUNTU_VER:latest \
+        -t $CI_REGISTRY_IMAGE:$UBUNTU_VER \
+        -t $CI_REGISTRY_IMAGE:latest \
         --platform $PLATFORMS \
+        --cache-from $CI_REGISTRY_IMAGE/ubuntu-$UBUNTU_VER:cache \
+        --cache-to $CI_REGISTRY_IMAGE/ubuntu-$UBUNTU_VER:cache \
         --push --provenance false
 fi