From a4b6ae452d21a4a45e652d2c070422631002dff2 Mon Sep 17 00:00:00 2001
From: Julian Rother <julian@cccv.de>
Date: Thu, 1 Feb 2024 19:29:42 +0100
Subject: [PATCH] Drop buster, add bookworm image
---
.gitlab-ci.yml | 12 ++++++------
Dockerfile.buster => Dockerfile.bookworm | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
rename Dockerfile.buster => Dockerfile.bookworm (68%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6990c4b..ebaac40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,9 @@
-build-buster:
+build-bullseye:
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
changes:
- - Dockerfile.buster
+ - Dockerfile.bullseye
- .gitlab-ci.yml
stage: build
image:
@@ -11,14 +11,14 @@ build-buster:
entrypoint: [""]
script:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.buster --destination $CI_REGISTRY_IMAGE/buster:$CI_COMMIT_TAG
+ - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.bullseye --destination $CI_REGISTRY_IMAGE/bullseye:$CI_COMMIT_TAG
-build-bullseye:
+build-bookworm:
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
changes:
- - Dockerfile.bullseye
+ - Dockerfile.bookworm
- .gitlab-ci.yml
stage: build
image:
@@ -26,7 +26,7 @@ build-bullseye:
entrypoint: [""]
script:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.bullseye --destination $CI_REGISTRY_IMAGE/bullseye:$CI_COMMIT_TAG
+ - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.bookworm --destination $CI_REGISTRY_IMAGE/bookworm:$CI_COMMIT_TAG
build-utility:
rules:
diff --git a/Dockerfile.buster b/Dockerfile.bookworm
similarity index 68%
rename from Dockerfile.buster
rename to Dockerfile.bookworm
index 04af1c0..46980e1 100644
--- a/Dockerfile.buster
+++ b/Dockerfile.bookworm
@@ -1,8 +1,8 @@
-FROM debian:bullseye AS debian-go-build
+FROM debian:bookworm AS debian-go-build
RUN apt-get -qq update && \
apt-get -qq dist-upgrade && \
- apt-get -qq install lsb-release curl wget ca-certificates locales-all git build-essential unzip golang-go && \
+ apt-get -qq install lsb-release curl wget ca-certificates locales-all git build-essential unzip golang-go jq && \
apt-get -qq clean && \
lsb_release -a && uname -a && go version
--
GitLab