diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b2efaa68b21e9fc7ce65bfbdf2d02cce63d5217_LmdpdGxhYi1jaS55bWw=..6ad3a0393b456a0a64974faa8b9de73e240aa38e_LmdpdGxhYi1jaS55bWw= 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,10 @@ +include: + - file: docker-build.gitlab-ci.yaml + project: xcg/ci-templates + variables: SUBGROUP: xbus FF_USE_FASTZIP: "true" CACHE_COMPRESSION_LEVEL: "fast" ARTIFACT_COMPRESSION_LEVEL: "fast" @@ -1,11 +5,8 @@ variables: SUBGROUP: xbus FF_USE_FASTZIP: "true" CACHE_COMPRESSION_LEVEL: "fast" ARTIFACT_COMPRESSION_LEVEL: "fast" -build_image: - image: - name: quay.orus.io/cc/buildkit - entrypoint: [""] +build-docker-image: variables: @@ -11,2 +12,4 @@ variables: + TAG_COMMIT_REF_SLUG: "yes" + TAG_LATEST: branch/default DOCKER_IMAGE: quay.orus.io/xbus-ci/xbus-build-image @@ -12,7 +15,2 @@ DOCKER_IMAGE: quay.orus.io/xbus-ci/xbus-build-image - DOCKERFILE: Dockerfile - DOCKER_BUILD_OPTS: --export-cache type=local,dest=$CI_PROJECT_DIR/.cache/buildkit --import-cache type=local,src=$CI_PROJECT_DIR/.cache/buildkit - cache: - paths: - - .cache/buildkit script: @@ -18,2 +16,2 @@ script: - - build-img + - docker-build diff --git a/Dockerfile b/Dockerfile index 7b2efaa68b21e9fc7ce65bfbdf2d02cce63d5217_RG9ja2VyZmlsZQ==..6ad3a0393b456a0a64974faa8b9de73e240aa38e_RG9ja2VyZmlsZQ== 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.orus.io/docker_mirror/golang:1.22.7-bookworm +FROM quay.orus.io/docker_mirror/golang:1.23.2-bookworm RUN DEBIAN_FRONTEND=noninteractive \ apt-get update \