v2.8.0 (#135)

Minor updates
* Adding Alpine 3.21 and making it the default

.github/workflows/dev.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20" ]
+        alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21" ]
     runs-on: ubuntu-latest
     steps:
       -
@@ -108,7 +108,7 @@ jobs:
       -
         name: Build and push default tags
         id: docker_build_default
-        if: matrix.alpine == '3.20'
+        if: matrix.alpine == '3.21'
         uses: docker/build-push-action@v6
         with:
           file: ./${{ matrix.alpine }}/Dockerfile

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20" ]
+        alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21" ]
     runs-on: ubuntu-latest
     steps:
       -
@@ -92,7 +92,7 @@ jobs:
       -
         name: Build and push default tags
         id: docker_build_default
-        if: matrix.alpine == '3.20'
+        if: matrix.alpine == '3.21'
         uses: docker/build-push-action@v6
         with:
           context: .

3.21/ALPINE_REVISION

@@ -0,0 +1 @@
+3.21.0

3.21/Dockerfile

@@ -0,0 +1,89 @@
+#======================================================================================================================
+# STAGE 0: store build information
+#======================================================================================================================
+
+FROM --platform=${BUILDPLATFORM} golang:alpine AS build
+ARG TARGETPLATFORM
+
+RUN \
+    # save platform and version information to log
+    echo "Platform: ${TARGETPLATFORM}" >> /log && \
+    echo "Alpine: 3.21.0" >> /log && \
+    echo "Busybox: 1.36.1" >> /log && \
+    echo "Nushell: 0.100.0" >> /log
+
+
+#======================================================================================================================
+# STAGE 1: load busybox
+#======================================================================================================================
+
+FROM ghcr.io/bfren/busybox:1.36.1-alpine3.21.0-240913 AS busybox
+
+
+#======================================================================================================================
+# STAGE 2: load Nushell
+#======================================================================================================================
+
+FROM ghcr.io/bfren/nushell:0.100.0-alpine-241018 AS nushell
+
+
+#======================================================================================================================
+# STAGE 3: install bfren platform
+#======================================================================================================================
+
+FROM alpine:3.21.0 AS install
+COPY --from=build /log /etc/bf/BUILD
+COPY --from=busybox / /bin
+COPY --from=nushell / /
+
+ARG BF_IMAGE
+ARG BF_PUBLISHING
+ARG BF_VERSION
+
+COPY ./overlay /
+COPY ./3.21/overlay /
+
+ENV \
+    # path to bf configuration - installation script requires this
+    BF_ETC=/etc/bf \
+    # set container to this timezone
+    BF_TZ=Europe/London \
+    # whether or not to upgrade packages during installation
+    #   0: no
+    #   1: yes
+    BF_UPGRADE_PACKAGES=0 \
+    # Nushell version string to check against installed verion after installation
+    NU_VERSION=0.100.0
+
+RUN \
+    # add packages required by Nushell
+    apk add --no-cache libcrypto3 libgcc libssl3 sqlite-libs && \
+    # install busybox
+    busybox --install && \
+    # setup Nushell using preinstallation script
+    chmod +x /preinstall && /preinstall && \
+    # run standard bf installation executable
+    /usr/bin/bf/bf-install
+
+
+#======================================================================================================================
+# STAGE 4: create final image
+#======================================================================================================================
+
+FROM scratch AS final
+COPY --from=install / /
+
+LABEL org.opencontainers.image.description="Alpine Linux with Nushell."
+LABEL org.opencontainers.image.source="https://github.com/bfren/docker-alpine"
+
+ENV \
+    # debug log output
+    #   0: disable
+    #   1: enable
+    BF_DEBUG=0 \
+    # path to bfren configuration directory
+    BF_ETC=/etc/bf \
+    # add bfren executables to PATH
+    PATH=/usr/bin/bf:${PATH}
+
+ENTRYPOINT [ "/init" ]

3.21/overlay/etc/apk/repositories

@@ -0,0 +1,5 @@
+https://dl-cdn.alpinelinux.org/alpine/v3.21/main
+https://dl-cdn.alpinelinux.org/alpine/v3.21/community
+@edgemain https://dl-cdn.alpinelinux.org/alpine/edge/main
+@edgecomm https://dl-cdn.alpinelinux.org/alpine/edge/community
+@edgetest https://dl-cdn.alpinelinux.org/alpine/edge/testing

VERSION

@@ -1 +1 @@
-2.7.8
+2.8.0

VERSION_MINOR

@@ -1 +1 @@
-2.7
+2.8

generate.sh

@@ -8,7 +8,7 @@ BUSYBOX_VERSION="1.36.1"
 BUSYBOX_BUILD="240913"
 NU_VERSION="0.100.0"
 NU_BUILD="241018"
-ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20"
+ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21"
 
 for E in ${ALPINE_EDITIONS} ; do
 

run.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 IMAGE=`cat VERSION`
-ALPINE=${1:-3.20}
+ALPINE=${1:-3.21}
 
 docker buildx build \
     --load \

test.sh

@@ -2,7 +2,7 @@
 
 IMAGE=alpine
 VERSION=`cat VERSION`
-ALPINE=${1:-3.20}
+ALPINE=${1:-3.21}
 TAG=${IMAGE}-test
 
 docker buildx build \