Simplified tagging. Added option for build caching. The cache is stored on the registry along the images.

This commit is contained in:
2023-03-22 00:08:17 +08:00
parent 18cceb6961
commit f4582c8a39

View File

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