diff --git a/3.15/Dockerfile b/3.15/Dockerfile index fb65bb405..3d620e743 100644 --- a/3.15/Dockerfile +++ b/3.15/Dockerfile @@ -26,7 +26,7 @@ FROM quay.io/bfren/busybox:1.36.1-alpine3.15.11-260128 AS busybox # STAGE 2: load Nushell #====================================================================================================================== -FROM quay.io/bfren/nushell:0.112.1-alpine-251121 AS nushell +FROM quay.io/bfren/nushell:0.112.1-alpine-260421 AS nushell #====================================================================================================================== diff --git a/3.16/Dockerfile b/3.16/Dockerfile index 52c7ce0ee..a312c28a6 100644 --- a/3.16/Dockerfile +++ b/3.16/Dockerfile @@ -26,7 +26,7 @@ FROM quay.io/bfren/busybox:1.36.1-alpine3.16.9-260128 AS busybox # STAGE 2: load Nushell #====================================================================================================================== -FROM quay.io/bfren/nushell:0.112.1-alpine-251121 AS nushell +FROM quay.io/bfren/nushell:0.112.1-alpine-260421 AS nushell #====================================================================================================================== diff --git a/3.17/Dockerfile b/3.17/Dockerfile index 35b614843..c63d23dca 100644 --- a/3.17/Dockerfile +++ b/3.17/Dockerfile @@ -26,7 +26,7 @@ FROM quay.io/bfren/busybox:1.36.1-alpine3.17.10-260128 AS busybox # STAGE 2: load Nushell #====================================================================================================================== -FROM quay.io/bfren/nushell:0.112.1-alpine-251121 AS nushell +FROM quay.io/bfren/nushell:0.112.1-alpine-260421 AS nushell #====================================================================================================================== diff --git a/3.18/Dockerfile b/3.18/Dockerfile index 03c69f0bf..5663e85d1 100644 --- a/3.18/Dockerfile +++ b/3.18/Dockerfile @@ -26,7 +26,7 @@ FROM quay.io/bfren/busybox:1.36.1-alpine3.18.12-260128 AS busybox # STAGE 2: load Nushell #====================================================================================================================== -FROM quay.io/bfren/nushell:0.112.1-alpine-251121 AS nushell +FROM quay.io/bfren/nushell:0.112.1-alpine-260421 AS nushell #====================================================================================================================== diff --git a/3.19/Dockerfile b/3.19/Dockerfile index 37f9ce645..d9624eccd 100644 --- a/3.19/Dockerfile +++ b/3.19/Dockerfile @@ -26,7 +26,7 @@ FROM quay.io/bfren/busybox:1.36.1-alpine3.19.9-260128 AS busybox # STAGE 2: load Nushell #====================================================================================================================== -FROM quay.io/bfren/nushell:0.112.1-alpine-251121 AS nushell +FROM quay.io/bfren/nushell:0.112.1-alpine-260421 AS nushell #====================================================================================================================== diff --git a/3.20/ALPINE_REVISION b/3.20/ALPINE_REVISION index 937ddd74b..d804c182d 100644 --- a/3.20/ALPINE_REVISION +++ b/3.20/ALPINE_REVISION @@ -1 +1 @@ -3.20.9 \ No newline at end of file +3.20.10 \ No newline at end of file diff --git a/3.20/Dockerfile b/3.20/Dockerfile index 30beddf97..ea7fd079d 100644 --- a/3.20/Dockerfile +++ b/3.20/Dockerfile @@ -10,7 +10,7 @@ ARG TARGETPLATFORM RUN \ # save platform and version information to log echo "Platform: ${TARGETPLATFORM}" >> /log && \ - echo "Alpine: 3.20.9" >> /log && \ + echo "Alpine: 3.20.10" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ echo "Nushell: 0.112.1" >> /log @@ -19,21 +19,21 @@ RUN \ # STAGE 1: load busybox #====================================================================================================================== -FROM quay.io/bfren/busybox:1.36.1-alpine3.20.9-260128 AS busybox +FROM quay.io/bfren/busybox:1.36.1-alpine3.20.10-260128 AS busybox #====================================================================================================================== # STAGE 2: load Nushell #====================================================================================================================== -FROM quay.io/bfren/nushell:0.112.1-alpine-251121 AS nushell +FROM quay.io/bfren/nushell:0.112.1-alpine-260421 AS nushell #====================================================================================================================== # STAGE 3: install bfren platform #====================================================================================================================== -FROM alpine:3.20.9 AS install +FROM alpine:3.20.10 AS install COPY --from=build /log /etc/bf/BUILD COPY --from=busybox / /bin COPY --from=nushell / / diff --git a/3.21/ALPINE_REVISION b/3.21/ALPINE_REVISION index c80359b9d..33f552ff1 100644 --- a/3.21/ALPINE_REVISION +++ b/3.21/ALPINE_REVISION @@ -1 +1 @@ -3.21.6 \ No newline at end of file +3.21.7 \ No newline at end of file diff --git a/3.21/Dockerfile b/3.21/Dockerfile index 8ac8f0ddd..724708803 100644 --- a/3.21/Dockerfile +++ b/3.21/Dockerfile @@ -10,7 +10,7 @@ ARG TARGETPLATFORM RUN \ # save platform and version information to log echo "Platform: ${TARGETPLATFORM}" >> /log && \ - echo "Alpine: 3.21.6" >> /log && \ + echo "Alpine: 3.21.7" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ echo "Nushell: 0.112.1" >> /log @@ -19,21 +19,21 @@ RUN \ # STAGE 1: load busybox #====================================================================================================================== -FROM quay.io/bfren/busybox:1.36.1-alpine3.21.6-260128 AS busybox +FROM quay.io/bfren/busybox:1.36.1-alpine3.21.7-260128 AS busybox #====================================================================================================================== # STAGE 2: load Nushell #====================================================================================================================== -FROM quay.io/bfren/nushell:0.112.1-alpine-251121 AS nushell +FROM quay.io/bfren/nushell:0.112.1-alpine-260421 AS nushell #====================================================================================================================== # STAGE 3: install bfren platform #====================================================================================================================== -FROM alpine:3.21.6 AS install +FROM alpine:3.21.7 AS install COPY --from=build /log /etc/bf/BUILD COPY --from=busybox / /bin COPY --from=nushell / / diff --git a/3.22/ALPINE_REVISION b/3.22/ALPINE_REVISION index d9b2ac520..d1fefa895 100644 --- a/3.22/ALPINE_REVISION +++ b/3.22/ALPINE_REVISION @@ -1 +1 @@ -3.22.3 \ No newline at end of file +3.22.4 \ No newline at end of file diff --git a/3.22/Dockerfile b/3.22/Dockerfile index 622e5eb65..7e4a0fd6a 100644 --- a/3.22/Dockerfile +++ b/3.22/Dockerfile @@ -10,7 +10,7 @@ ARG TARGETPLATFORM RUN \ # save platform and version information to log echo "Platform: ${TARGETPLATFORM}" >> /log && \ - echo "Alpine: 3.22.3" >> /log && \ + echo "Alpine: 3.22.4" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ echo "Nushell: 0.112.1" >> /log @@ -19,21 +19,21 @@ RUN \ # STAGE 1: load busybox #====================================================================================================================== -FROM quay.io/bfren/busybox:1.36.1-alpine3.22.3-260128 AS busybox +FROM quay.io/bfren/busybox:1.36.1-alpine3.22.4-260128 AS busybox #====================================================================================================================== # STAGE 2: load Nushell #====================================================================================================================== -FROM quay.io/bfren/nushell:0.112.1-alpine-251121 AS nushell +FROM quay.io/bfren/nushell:0.112.1-alpine-260421 AS nushell #====================================================================================================================== # STAGE 3: install bfren platform #====================================================================================================================== -FROM alpine:3.22.3 AS install +FROM alpine:3.22.4 AS install COPY --from=build /log /etc/bf/BUILD COPY --from=busybox / /bin COPY --from=nushell / / diff --git a/3.23/ALPINE_REVISION b/3.23/ALPINE_REVISION index f8cba501b..a3011d49b 100644 --- a/3.23/ALPINE_REVISION +++ b/3.23/ALPINE_REVISION @@ -1 +1 @@ -3.23.3 \ No newline at end of file +3.23.4 \ No newline at end of file diff --git a/3.23/Dockerfile b/3.23/Dockerfile index 007341ea9..602d062ec 100644 --- a/3.23/Dockerfile +++ b/3.23/Dockerfile @@ -10,7 +10,7 @@ ARG TARGETPLATFORM RUN \ # save platform and version information to log echo "Platform: ${TARGETPLATFORM}" >> /log && \ - echo "Alpine: 3.23.3" >> /log && \ + echo "Alpine: 3.23.4" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ echo "Nushell: 0.112.1" >> /log @@ -19,21 +19,21 @@ RUN \ # STAGE 1: load busybox #====================================================================================================================== -FROM quay.io/bfren/busybox:1.36.1-alpine3.23.3-260128 AS busybox +FROM quay.io/bfren/busybox:1.36.1-alpine3.23.4-260128 AS busybox #====================================================================================================================== # STAGE 2: load Nushell #====================================================================================================================== -FROM quay.io/bfren/nushell:0.112.1-alpine-251121 AS nushell +FROM quay.io/bfren/nushell:0.112.1-alpine-260421 AS nushell #====================================================================================================================== # STAGE 3: install bfren platform #====================================================================================================================== -FROM alpine:3.23.3 AS install +FROM alpine:3.23.4 AS install COPY --from=build /log /etc/bf/BUILD COPY --from=busybox / /bin COPY --from=nushell / / diff --git a/VERSION b/VERSION index 97ceee1b9..8a4b2758e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.5 \ No newline at end of file +3.1.6 \ No newline at end of file diff --git a/generate.sh b/generate.sh index e9354b582..04778b11c 100755 --- a/generate.sh +++ b/generate.sh @@ -7,7 +7,7 @@ docker pull bfren/alpine BUSYBOX_VERSION="1.36.1" BUSYBOX_BUILD="260128" NU_VERSION="0.112.1" -NU_BUILD="251121" +NU_BUILD="260421" ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22 3.23" for E in ${ALPINE_EDITIONS} ; do diff --git a/overlay/preinstall b/overlay/preinstall index cfaccfdf2..3fcdc4772 100644 --- a/overlay/preinstall +++ b/overlay/preinstall @@ -10,7 +10,6 @@ set -euo pipefail NU=/etc/nu CFG=/root/.config/nushell mv ${CFG}/config.nu ${NU} -mv ${CFG}/env.nu ${NU} #====================================================================================================================== @@ -18,7 +17,6 @@ mv ${CFG}/env.nu ${NU} #====================================================================================================================== ln -sf ${NU}/config.nu ${CFG}/config.nu -ln -sf ${NU}/env.nu ${CFG}/env.nu ln -sf ${NU}/scripts ${CFG}/scripts