Merge pull request #149 from bitnami/add-bookworm-support

Add support for Debian 12 bookworm

.github/actions/build/action.yml

@@ -1,7 +1,7 @@
 inputs:
   dist:
     description: 'Dist to build'
-    default: 'bullseye'
+    default: 'bookworm'
   platform:
     description: 'Platform to build'
     default: 'amd64'

.github/workflows/main.yml

@@ -16,7 +16,7 @@ on:
     - cron:  '0 0 * * *'
 env:
   BASENAME: bitnami/minideb
-  LATEST: bullseye
+  LATEST: bookworm
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
@@ -41,7 +41,7 @@ jobs:
     needs: [ shellcheck ]
     strategy:
       matrix:
-        dist: [buster, bullseye]
+        dist: [buster, bullseye, bookworm]
         arch: [amd64, arm64]
 
     name: Build ${{ matrix.dist }} on ${{ matrix.arch }}
@@ -81,7 +81,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Push Manifests
         run: |
-          DISTS="buster bullseye latest" bash pushmanifest
+          DISTS="buster bullseye bookworm latest" bash pushmanifest
 
   # If the CI Pipeline does not succeed we should notify the interested agents
   slack-notif:

README.md

@@ -14,14 +14,14 @@ $ docker run --rm -it bitnami/minideb:latest
 
 There are [tags](https://hub.docker.com/r/bitnami/minideb/tags/) for the different Debian releases.
 ```
-$ docker run --rm -it bitnami/minideb:bullseye
+$ docker run --rm -it bitnami/minideb:bookworm
 ```
 
 The images are built daily and have the security release enabled, so will contain any security updates released more than 24 hours ago.
 
 You can also use the images as a base for your own `Dockerfile`:
 ```
-FROM bitnami/minideb:bullseye
+FROM bitnami/minideb:bookworm
 ```
 
 # Why use Minideb
@@ -62,28 +62,28 @@ We provide a Makefile to help you build Minideb locally. It should be run on a D
 $ sudo make
 ```
 
-To build an individual release (buster or bullseye)
+To build an individual release (buster, bullseye or bookworm)
 ```
-$ sudo make bullseye
+$ sudo make bookworm
 ```
 
 To test the resulting image:
 ```
-$ sudo make test-bullseye
+$ sudo make test-bookworm
 ```
 
 ## Building Minideb for foreign architecture
 Make commands shown above will build an image for the architecture you are currently working on.
 To build an image for a foreign architecture (for example to build a multiarch image), we provide a
 simple script which run a QEMU instance for the target architecture and build the image inside it.
 
-To build and test a bullseye image for arm64:
+To build and test a bookworm image for arm64:
 ```
-$ ./qemu_build bullseye arm64
+$ ./qemu_build bookworm arm64
 ```
 
 The image will be then imported locally through the docker cli with `$distribution-$architecture` tag
-(example: `bitnami/minideb:bullseye-arm64`)
+(example: `bitnami/minideb:bookworm-arm64`)
 
 Current limitations of `qemu_build` script:
 

buildall

@@ -10,6 +10,7 @@ arch=${1:-"amd64 arm64"}
 
 dist="buster
 bullseye
+bookworm
 "
 for a in $arch; do
   for i in $dist; do

debootstrap/bookworm

@@ -0,0 +1 @@
+buster

mkimage

@@ -71,14 +71,18 @@ fi
 rootfs_chroot bash debootstrap/debootstrap --second-stage
 
 repo_url="http://deb.debian.org/debian"
-sec_repo_url="http://security.debian.org/debian-security"
+sec_repo_url_1="${repo_url}-security"
+sec_repo_url_2="http://security.debian.org/debian-security"
 
 echo -e "deb ${repo_url} $DIST main" > "$rootfsDir/etc/apt/sources.list"
-if [ "$DIST" == "bullseye" ]; then
+if [ "$DIST" == "bookworm" ]; then
     echo "deb ${repo_url} $DIST-updates main" >> "$rootfsDir/etc/apt/sources.list"
-    echo "deb ${sec_repo_url} $DIST-security main" >> "$rootfsDir/etc/apt/sources.list"
+    echo "deb ${sec_repo_url_1} $DIST-security main" >> "$rootfsDir/etc/apt/sources.list"
+elif [ "$DIST" == "bullseye" ]; then
+    echo "deb ${repo_url} $DIST-updates main" >> "$rootfsDir/etc/apt/sources.list"
+    echo "deb ${sec_repo_url_2} $DIST-security main" >> "$rootfsDir/etc/apt/sources.list"
 elif [ "$DIST" == "buster" ]; then
-    echo "deb ${sec_repo_url} $DIST/updates main" >> "$rootfsDir/etc/apt/sources.list"
+    echo "deb ${sec_repo_url_2} $DIST/updates main" >> "$rootfsDir/etc/apt/sources.list"
 fi
 
 rootfs_chroot apt-get update

pushall

@@ -6,8 +6,9 @@ set -o pipefail
 
 DISTS="buster
 bullseye
+bookworm
 "
-LATEST=bullseye
+LATEST=bookworm
 BASENAME=bitnami/minideb
 
 if [ -n "${DOCKER_PASSWORD:-}" ]; then

pushmanifest

@@ -6,6 +6,7 @@ set -o pipefail
 
 DISTS=${DISTS:-"buster
 bullseye
+bookworm
 latest
 "}