From 4a128d5503587d462104546796173e86db8a4949 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 24 Jan 2025 14:36:54 +0000 Subject: [PATCH] v2.8.1 (#136) Minor updates * Updating to Alpine 3.18.11, 3.19.6, 3.20.5 and 3.21.2 * Updating to Nushell 0.101.0 Documentation updates * Updating copyright year to 2025 * Updating Alpine versions in README --- 3.15/Dockerfile | 6 +++--- 3.16/Dockerfile | 6 +++--- 3.17/Dockerfile | 6 +++--- 3.18/ALPINE_REVISION | 2 +- 3.18/Dockerfile | 12 ++++++------ 3.19/ALPINE_REVISION | 2 +- 3.19/Dockerfile | 12 ++++++------ 3.20/ALPINE_REVISION | 2 +- 3.20/Dockerfile | 12 ++++++------ 3.21/ALPINE_REVISION | 2 +- 3.21/Dockerfile | 12 ++++++------ LICENSE | 2 +- README.md | 10 ++++++---- VERSION | 2 +- generate.sh | 4 ++-- overlay/tmp/env-load.nu | 6 +++--- 16 files changed, 50 insertions(+), 48 deletions(-) diff --git a/3.15/Dockerfile b/3.15/Dockerfile index f58fa2350..e5d99c103 100644 --- a/3.15/Dockerfile +++ b/3.15/Dockerfile @@ -10,7 +10,7 @@ RUN \ echo "Platform: ${TARGETPLATFORM}" >> /log && \ echo "Alpine: 3.15.11" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ - echo "Nushell: 0.100.0" >> /log + echo "Nushell: 0.101.0" >> /log #====================================================================================================================== @@ -24,7 +24,7 @@ FROM ghcr.io/bfren/busybox:1.36.1-alpine3.15.11-240913 AS busybox # STAGE 2: load Nushell #====================================================================================================================== -FROM ghcr.io/bfren/nushell:0.100.0-alpine-241018 AS nushell +FROM ghcr.io/bfren/nushell:0.101.0-alpine-250124 AS nushell #====================================================================================================================== @@ -53,7 +53,7 @@ ENV \ # 1: yes BF_UPGRADE_PACKAGES=0 \ # Nushell version string to check against installed verion after installation - NU_VERSION=0.100.0 + NU_VERSION=0.101.0 RUN \ # add packages required by Nushell diff --git a/3.16/Dockerfile b/3.16/Dockerfile index 5e6e3a578..087a10bf2 100644 --- a/3.16/Dockerfile +++ b/3.16/Dockerfile @@ -10,7 +10,7 @@ RUN \ echo "Platform: ${TARGETPLATFORM}" >> /log && \ echo "Alpine: 3.16.9" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ - echo "Nushell: 0.100.0" >> /log + echo "Nushell: 0.101.0" >> /log #====================================================================================================================== @@ -24,7 +24,7 @@ FROM ghcr.io/bfren/busybox:1.36.1-alpine3.16.9-240913 AS busybox # STAGE 2: load Nushell #====================================================================================================================== -FROM ghcr.io/bfren/nushell:0.100.0-alpine-241018 AS nushell +FROM ghcr.io/bfren/nushell:0.101.0-alpine-250124 AS nushell #====================================================================================================================== @@ -53,7 +53,7 @@ ENV \ # 1: yes BF_UPGRADE_PACKAGES=0 \ # Nushell version string to check against installed verion after installation - NU_VERSION=0.100.0 + NU_VERSION=0.101.0 RUN \ # add packages required by Nushell diff --git a/3.17/Dockerfile b/3.17/Dockerfile index 294606fff..619fb8aa5 100644 --- a/3.17/Dockerfile +++ b/3.17/Dockerfile @@ -10,7 +10,7 @@ RUN \ echo "Platform: ${TARGETPLATFORM}" >> /log && \ echo "Alpine: 3.17.10" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ - echo "Nushell: 0.100.0" >> /log + echo "Nushell: 0.101.0" >> /log #====================================================================================================================== @@ -24,7 +24,7 @@ FROM ghcr.io/bfren/busybox:1.36.1-alpine3.17.10-240913 AS busybox # STAGE 2: load Nushell #====================================================================================================================== -FROM ghcr.io/bfren/nushell:0.100.0-alpine-241018 AS nushell +FROM ghcr.io/bfren/nushell:0.101.0-alpine-250124 AS nushell #====================================================================================================================== @@ -53,7 +53,7 @@ ENV \ # 1: yes BF_UPGRADE_PACKAGES=0 \ # Nushell version string to check against installed verion after installation - NU_VERSION=0.100.0 + NU_VERSION=0.101.0 RUN \ # add packages required by Nushell diff --git a/3.18/ALPINE_REVISION b/3.18/ALPINE_REVISION index c727bc9ed..053c1c624 100644 --- a/3.18/ALPINE_REVISION +++ b/3.18/ALPINE_REVISION @@ -1 +1 @@ -3.18.9 \ No newline at end of file +3.18.11 \ No newline at end of file diff --git a/3.18/Dockerfile b/3.18/Dockerfile index 83644e1c5..0c638279d 100644 --- a/3.18/Dockerfile +++ b/3.18/Dockerfile @@ -8,30 +8,30 @@ ARG TARGETPLATFORM RUN \ # save platform and version information to log echo "Platform: ${TARGETPLATFORM}" >> /log && \ - echo "Alpine: 3.18.9" >> /log && \ + echo "Alpine: 3.18.11" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ - echo "Nushell: 0.100.0" >> /log + echo "Nushell: 0.101.0" >> /log #====================================================================================================================== # STAGE 1: load busybox #====================================================================================================================== -FROM ghcr.io/bfren/busybox:1.36.1-alpine3.18.9-240913 AS busybox +FROM ghcr.io/bfren/busybox:1.36.1-alpine3.18.11-240913 AS busybox #====================================================================================================================== # STAGE 2: load Nushell #====================================================================================================================== -FROM ghcr.io/bfren/nushell:0.100.0-alpine-241018 AS nushell +FROM ghcr.io/bfren/nushell:0.101.0-alpine-250124 AS nushell #====================================================================================================================== # STAGE 3: install bfren platform #====================================================================================================================== -FROM alpine:3.18.9 AS install +FROM alpine:3.18.11 AS install COPY --from=build /log /etc/bf/BUILD COPY --from=busybox / /bin COPY --from=nushell / / @@ -53,7 +53,7 @@ ENV \ # 1: yes BF_UPGRADE_PACKAGES=0 \ # Nushell version string to check against installed verion after installation - NU_VERSION=0.100.0 + NU_VERSION=0.101.0 RUN \ # add packages required by Nushell diff --git a/3.19/ALPINE_REVISION b/3.19/ALPINE_REVISION index 2fe414eff..ff6984ea3 100644 --- a/3.19/ALPINE_REVISION +++ b/3.19/ALPINE_REVISION @@ -1 +1 @@ -3.19.4 \ No newline at end of file +3.19.6 \ No newline at end of file diff --git a/3.19/Dockerfile b/3.19/Dockerfile index e0d1956ae..70424009b 100644 --- a/3.19/Dockerfile +++ b/3.19/Dockerfile @@ -8,30 +8,30 @@ ARG TARGETPLATFORM RUN \ # save platform and version information to log echo "Platform: ${TARGETPLATFORM}" >> /log && \ - echo "Alpine: 3.19.4" >> /log && \ + echo "Alpine: 3.19.6" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ - echo "Nushell: 0.100.0" >> /log + echo "Nushell: 0.101.0" >> /log #====================================================================================================================== # STAGE 1: load busybox #====================================================================================================================== -FROM ghcr.io/bfren/busybox:1.36.1-alpine3.19.4-240913 AS busybox +FROM ghcr.io/bfren/busybox:1.36.1-alpine3.19.6-240913 AS busybox #====================================================================================================================== # STAGE 2: load Nushell #====================================================================================================================== -FROM ghcr.io/bfren/nushell:0.100.0-alpine-241018 AS nushell +FROM ghcr.io/bfren/nushell:0.101.0-alpine-250124 AS nushell #====================================================================================================================== # STAGE 3: install bfren platform #====================================================================================================================== -FROM alpine:3.19.4 AS install +FROM alpine:3.19.6 AS install COPY --from=build /log /etc/bf/BUILD COPY --from=busybox / /bin COPY --from=nushell / / @@ -53,7 +53,7 @@ ENV \ # 1: yes BF_UPGRADE_PACKAGES=0 \ # Nushell version string to check against installed verion after installation - NU_VERSION=0.100.0 + NU_VERSION=0.101.0 RUN \ # add packages required by Nushell diff --git a/3.20/ALPINE_REVISION b/3.20/ALPINE_REVISION index de8c7d09a..fd8bfd570 100644 --- a/3.20/ALPINE_REVISION +++ b/3.20/ALPINE_REVISION @@ -1 +1 @@ -3.20.3 \ No newline at end of file +3.20.5 \ No newline at end of file diff --git a/3.20/Dockerfile b/3.20/Dockerfile index 4ae76023b..a3d60f46c 100644 --- a/3.20/Dockerfile +++ b/3.20/Dockerfile @@ -8,30 +8,30 @@ ARG TARGETPLATFORM RUN \ # save platform and version information to log echo "Platform: ${TARGETPLATFORM}" >> /log && \ - echo "Alpine: 3.20.3" >> /log && \ + echo "Alpine: 3.20.5" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ - echo "Nushell: 0.100.0" >> /log + echo "Nushell: 0.101.0" >> /log #====================================================================================================================== # STAGE 1: load busybox #====================================================================================================================== -FROM ghcr.io/bfren/busybox:1.36.1-alpine3.20.3-240913 AS busybox +FROM ghcr.io/bfren/busybox:1.36.1-alpine3.20.5-240913 AS busybox #====================================================================================================================== # STAGE 2: load Nushell #====================================================================================================================== -FROM ghcr.io/bfren/nushell:0.100.0-alpine-241018 AS nushell +FROM ghcr.io/bfren/nushell:0.101.0-alpine-250124 AS nushell #====================================================================================================================== # STAGE 3: install bfren platform #====================================================================================================================== -FROM alpine:3.20.3 AS install +FROM alpine:3.20.5 AS install COPY --from=build /log /etc/bf/BUILD COPY --from=busybox / /bin COPY --from=nushell / / @@ -53,7 +53,7 @@ ENV \ # 1: yes BF_UPGRADE_PACKAGES=0 \ # Nushell version string to check against installed verion after installation - NU_VERSION=0.100.0 + NU_VERSION=0.101.0 RUN \ # add packages required by Nushell diff --git a/3.21/ALPINE_REVISION b/3.21/ALPINE_REVISION index 1d094fc2b..b0652f4e8 100644 --- a/3.21/ALPINE_REVISION +++ b/3.21/ALPINE_REVISION @@ -1 +1 @@ -3.21.0 \ No newline at end of file +3.21.2 \ No newline at end of file diff --git a/3.21/Dockerfile b/3.21/Dockerfile index e30aa5707..cd7af5f43 100644 --- a/3.21/Dockerfile +++ b/3.21/Dockerfile @@ -8,30 +8,30 @@ ARG TARGETPLATFORM RUN \ # save platform and version information to log echo "Platform: ${TARGETPLATFORM}" >> /log && \ - echo "Alpine: 3.21.0" >> /log && \ + echo "Alpine: 3.21.2" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ - echo "Nushell: 0.100.0" >> /log + echo "Nushell: 0.101.0" >> /log #====================================================================================================================== # STAGE 1: load busybox #====================================================================================================================== -FROM ghcr.io/bfren/busybox:1.36.1-alpine3.21.0-240913 AS busybox +FROM ghcr.io/bfren/busybox:1.36.1-alpine3.21.2-240913 AS busybox #====================================================================================================================== # STAGE 2: load Nushell #====================================================================================================================== -FROM ghcr.io/bfren/nushell:0.100.0-alpine-241018 AS nushell +FROM ghcr.io/bfren/nushell:0.101.0-alpine-250124 AS nushell #====================================================================================================================== # STAGE 3: install bfren platform #====================================================================================================================== -FROM alpine:3.21.0 AS install +FROM alpine:3.21.2 AS install COPY --from=build /log /etc/bf/BUILD COPY --from=busybox / /bin COPY --from=nushell / / @@ -53,7 +53,7 @@ ENV \ # 1: yes BF_UPGRADE_PACKAGES=0 \ # Nushell version string to check against installed verion after installation - NU_VERSION=0.100.0 + NU_VERSION=0.101.0 RUN \ # add packages required by Nushell diff --git a/LICENSE b/LICENSE index 2d3ed2bba..f40bb91de 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT Licence -Copyright (c) 2021-2024 bfren +Copyright (c) 2021-2025 bfren Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 44ade4034..4948fd627 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ You can pin by Alpine version: +- **alpine3.21, alpine3.21.x** (EOL: 2026-11-01) +- **alpine3.20, alpine3.20.x** (EOL: 2026-04-01) - **alpine3.19, alpine3.19.x** (EOL: 2025-12-01) - **alpine3.18, alpine3.18.x** (EOL: 2025-05-09) - **alpine3.17, alpine3.17.x** (EOL: 2024-11-22) @@ -18,10 +20,10 @@ You can pin by Alpine version: Or if you want a specific base image build you can add a version suffix, e.g.: -- alpine3.18-2.0 -- alpine3.17-2.0.5 +- alpine3.21-2.8 +- alpine3.20-2.7.8 -These pin to v2.0.x of my Alpine 3.18 image and v2.0.5 of my Alpine 3.17 image respectively. +These pin to v2.8.x of my Alpine 3.21 image and v2.7.8 of my Alpine 3.20 image respectively. ## Licence @@ -29,4 +31,4 @@ These pin to v2.0.x of my Alpine 3.18 image and v2.0.5 of my Alpine 3.17 image r ## Copyright -> Copyright (c) 2021-2024 [bfren](https://bfren.dev) (unless otherwise stated) +> Copyright (c) 2021-2025 [bfren](https://bfren.dev) (unless otherwise stated) diff --git a/VERSION b/VERSION index 6533b6687..96d771776 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.8.0 \ No newline at end of file +2.8.1 \ No newline at end of file diff --git a/generate.sh b/generate.sh index dd2cb9b4e..cac779d49 100755 --- a/generate.sh +++ b/generate.sh @@ -6,8 +6,8 @@ docker pull bfren/alpine BUSYBOX_VERSION="1.36.1" BUSYBOX_BUILD="240913" -NU_VERSION="0.100.0" -NU_BUILD="241018" +NU_VERSION="0.101.0" +NU_BUILD="250124" ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21" for E in ${ALPINE_EDITIONS} ; do diff --git a/overlay/tmp/env-load.nu b/overlay/tmp/env-load.nu index c02017157..846c229e2 100644 --- a/overlay/tmp/env-load.nu +++ b/overlay/tmp/env-load.nu @@ -1,4 +1,4 @@ # load environment when entering shell -$env.config = ($env.config | upsert hooks { - pre_prompt: { ^bf-withenv env | lines | parse "{key}={val}" | transpose -i -r -d | load-env $in } -}) +$env.config.hooks.pre_prompt ++= [ + { ^bf-withenv env | lines | parse "{key}={val}" | transpose -i -r -d | load-env $in } +]