From 0d582737ccbbb97b9a4e38a2e8e8096c658d4afd Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 12 Jul 2026 09:34:03 +0100 Subject: [PATCH 1/7] Bumping version to 5.1.15 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 63f23b1..40dc926 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.1.14 \ No newline at end of file +5.1.15 \ No newline at end of file From 1d972226c286179360e0f078129a63c164d233ef Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 12 Jul 2026 10:13:34 +0100 Subject: [PATCH 2/7] Updating GitHub workflows --- .github/workflows/auto-pr.yml | 2 +- .github/workflows/dev.yml | 16 ++++++++-------- .github/workflows/publish.yml | 14 +++++++------- .github/workflows/update-readme.yml | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 0d434ac..61886a1 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout Branch ${{ github.ref_name }} - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Create Pull Request run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}." diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index fb67c20..ea01f0a 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -50,19 +50,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Quay.io Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: quay.io username: ${{ github.repository_owner }} @@ -70,7 +70,7 @@ jobs: - name: Build and export id: docker_export - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: file: ./${{ matrix.debian }}/Dockerfile build-args: | @@ -86,7 +86,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: ./${{ matrix.debian }}/Dockerfile @@ -116,7 +116,7 @@ jobs: name: Build and push default tags id: docker_build_default if: matrix.debian == '13' - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: ./${{ matrix.debian }}/Dockerfile diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index cbf80f9..d30e176 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -52,19 +52,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Quay.io Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: quay.io username: ${{ github.repository_owner }} @@ -72,7 +72,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: ./${{ matrix.debian }}/Dockerfile @@ -106,7 +106,7 @@ jobs: - name: Build and push default tags id: docker_build_default - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 if: matrix.debian == '13' with: context: . diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index 7153006..31e6472 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -15,10 +15,10 @@ jobs: shell: bash - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From b112628c6d37143ce7fd3c8958474871df6bd8ae Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 12 Jul 2026 10:13:40 +0100 Subject: [PATCH 3/7] Using latest base images --- 12/Dockerfile | 2 +- 13/Dockerfile | 2 +- generate-dockerfiles.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/12/Dockerfile b/12/Dockerfile index 59a1e27..18e5b32 100644 --- a/12/Dockerfile +++ b/12/Dockerfile @@ -37,7 +37,7 @@ WORKDIR /tmp RUN \ # get the overlay from the Alpine base image echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v3.2.2 https://github.com/bfren/docker-alpine.git && \ + apk add git && git clone --branch v3.2.4 https://github.com/bfren/docker-alpine.git && \ mv docker-alpine/overlay / diff --git a/13/Dockerfile b/13/Dockerfile index daea7c3..2f0602c 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -37,7 +37,7 @@ WORKDIR /tmp RUN \ # get the overlay from the Alpine base image echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v3.2.2 https://github.com/bfren/docker-alpine.git && \ + apk add git && git clone --branch v3.2.4 https://github.com/bfren/docker-alpine.git && \ mv docker-alpine/overlay / diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 1adbf88..c1082da 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -ALPINE_BRANCH="v3.2.2" +ALPINE_BRANCH="v3.2.4" BUSYBOX_VERSION="1.36.1" BUSYBOX_BUILD="260128" NU_VERSION="0.114.1" From 405e33d3809df3a40b11a527076e342cf33fe8c8 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 16 Jul 2026 17:25:36 +0100 Subject: [PATCH 4/7] Bumping version to 5.2.0 --- VERSION | 2 +- VERSION_MINOR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 40dc926..7cbea07 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.1.15 \ No newline at end of file +5.2.0 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index 8336407..341d0b5 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -5.1 \ No newline at end of file +5.2 \ No newline at end of file From 9b9822b57a3d57dd53e6c383b6371f8dc330089f Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 16 Jul 2026 17:26:37 +0100 Subject: [PATCH 5/7] Reverting nushell syntax change --- overlay/etc/nu/scripts/bf/pkg.nu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/etc/nu/scripts/bf/pkg.nu b/overlay/etc/nu/scripts/bf/pkg.nu index de232db..9463524 100644 --- a/overlay/etc/nu/scripts/bf/pkg.nu +++ b/overlay/etc/nu/scripts/bf/pkg.nu @@ -21,7 +21,7 @@ def action [ ^apt-get $cmd -y ...$args } } catch { - write error $"Error ($description | str lowercase) packages: ($joined)." $script + write error $"Error ($description | str downcase) packages: ($joined)." $script } } From 84d9b9fc98be8feb71b86324b491bfc2d7ddfe92 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 16 Jul 2026 17:26:49 +0100 Subject: [PATCH 6/7] Reverting to Nushall 0.113.1 Using latest Alpine branch --- 12/Dockerfile | 8 ++++---- 13/Dockerfile | 8 ++++---- generate-dockerfiles.sh | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/12/Dockerfile b/12/Dockerfile index 18e5b32..bee564b 100644 --- a/12/Dockerfile +++ b/12/Dockerfile @@ -10,7 +10,7 @@ RUN \ echo "Platform: ${TARGETPLATFORM}" >> /log && \ echo "Debian: 12.14" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ - echo "Nushell: 0.114.1" >> /log + echo "Nushell: 0.113.1" >> /log #====================================================================================================================== @@ -24,7 +24,7 @@ FROM quay.io/bfren/busybox:1.36.1-debian12.14-260128 AS busybox # STAGE 2: load Nushell #====================================================================================================================== -FROM quay.io/bfren/nushell:0.114.1-bookworm-260421 AS nushell +FROM quay.io/bfren/nushell:0.113.1-bookworm-260421 AS nushell #====================================================================================================================== @@ -37,7 +37,7 @@ WORKDIR /tmp RUN \ # get the overlay from the Alpine base image echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v3.2.4 https://github.com/bfren/docker-alpine.git && \ + apk add git && git clone --branch v3.3.0 https://github.com/bfren/docker-alpine.git && \ mv docker-alpine/overlay / @@ -67,7 +67,7 @@ ENV \ # 1: yes BF_UPGRADE_PACKAGES=0 \ # Nushell version string to check against installed verion after installation - NU_VERSION=0.114.1 + NU_VERSION=0.113.1 RUN \ # delete all binaries that will be replaced by busybox - those in ${IGNORE} will be left alone diff --git a/13/Dockerfile b/13/Dockerfile index 2f0602c..4b1810d 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -10,7 +10,7 @@ RUN \ echo "Platform: ${TARGETPLATFORM}" >> /log && \ echo "Debian: 13.5" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ - echo "Nushell: 0.114.1" >> /log + echo "Nushell: 0.113.1" >> /log #====================================================================================================================== @@ -24,7 +24,7 @@ FROM quay.io/bfren/busybox:1.36.1-debian13.5-260128 AS busybox # STAGE 2: load Nushell #====================================================================================================================== -FROM quay.io/bfren/nushell:0.114.1-trixie-260421 AS nushell +FROM quay.io/bfren/nushell:0.113.1-trixie-260421 AS nushell #====================================================================================================================== @@ -37,7 +37,7 @@ WORKDIR /tmp RUN \ # get the overlay from the Alpine base image echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v3.2.4 https://github.com/bfren/docker-alpine.git && \ + apk add git && git clone --branch v3.3.0 https://github.com/bfren/docker-alpine.git && \ mv docker-alpine/overlay / @@ -67,7 +67,7 @@ ENV \ # 1: yes BF_UPGRADE_PACKAGES=0 \ # Nushell version string to check against installed verion after installation - NU_VERSION=0.114.1 + NU_VERSION=0.113.1 RUN \ # delete all binaries that will be replaced by busybox - those in ${IGNORE} will be left alone diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index c1082da..01da189 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,10 +4,10 @@ set -euo pipefail docker pull bfren/alpine -ALPINE_BRANCH="v3.2.4" +ALPINE_BRANCH="v3.3.0" BUSYBOX_VERSION="1.36.1" BUSYBOX_BUILD="260128" -NU_VERSION="0.114.1" +NU_VERSION="0.113.1" NU_BUILD="260421" DEBIAN_VERSIONS="12 13" From 00bdaaf0c1e41ecb4aa06b6ed3e5e73b348a2c32 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 16 Jul 2026 17:34:50 +0100 Subject: [PATCH 7/7] Updating to Debian 12.15 and 13.6 --- 12/DEBIAN_MINOR | 2 +- 12/Dockerfile | 6 +++--- 13/DEBIAN_MINOR | 2 +- 13/Dockerfile | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/12/DEBIAN_MINOR b/12/DEBIAN_MINOR index 619dde3..f54f3b3 100644 --- a/12/DEBIAN_MINOR +++ b/12/DEBIAN_MINOR @@ -1 +1 @@ -12.14 \ No newline at end of file +12.15 \ No newline at end of file diff --git a/12/Dockerfile b/12/Dockerfile index bee564b..85e2a2a 100644 --- a/12/Dockerfile +++ b/12/Dockerfile @@ -8,7 +8,7 @@ ARG TARGETPLATFORM RUN \ # save platform and version information to log echo "Platform: ${TARGETPLATFORM}" >> /log && \ - echo "Debian: 12.14" >> /log && \ + echo "Debian: 12.15" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ echo "Nushell: 0.113.1" >> /log @@ -17,7 +17,7 @@ RUN \ # STAGE 1: load busybox #====================================================================================================================== -FROM quay.io/bfren/busybox:1.36.1-debian12.14-260128 AS busybox +FROM quay.io/bfren/busybox:1.36.1-debian12.15-260128 AS busybox #====================================================================================================================== @@ -45,7 +45,7 @@ RUN \ # STAGE 4: install bfren platform #====================================================================================================================== -FROM debian:12.14-slim AS install +FROM debian:12.15-slim AS install COPY --from=build /log /etc/bf/BUILD COPY --from=alpine /overlay / COPY --from=busybox / /bin diff --git a/13/DEBIAN_MINOR b/13/DEBIAN_MINOR index 2acb808..ab9da27 100644 --- a/13/DEBIAN_MINOR +++ b/13/DEBIAN_MINOR @@ -1 +1 @@ -13.5 \ No newline at end of file +13.6 \ No newline at end of file diff --git a/13/Dockerfile b/13/Dockerfile index 4b1810d..2c1cd46 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -8,7 +8,7 @@ ARG TARGETPLATFORM RUN \ # save platform and version information to log echo "Platform: ${TARGETPLATFORM}" >> /log && \ - echo "Debian: 13.5" >> /log && \ + echo "Debian: 13.6" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ echo "Nushell: 0.113.1" >> /log @@ -17,7 +17,7 @@ RUN \ # STAGE 1: load busybox #====================================================================================================================== -FROM quay.io/bfren/busybox:1.36.1-debian13.5-260128 AS busybox +FROM quay.io/bfren/busybox:1.36.1-debian13.6-260128 AS busybox #====================================================================================================================== @@ -45,7 +45,7 @@ RUN \ # STAGE 4: install bfren platform #====================================================================================================================== -FROM debian:13.5-slim AS install +FROM debian:13.6-slim AS install COPY --from=build /log /etc/bf/BUILD COPY --from=alpine /overlay / COPY --from=busybox / /bin