From 9ad97f526f1ac9486fab32cf0b581ddb5956e9b7 Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 19 May 2024 13:02:21 +0100 Subject: [PATCH] v3.1.4 (#59) Minor updates * Using latest Alpine branch * Using record syntax for with-env --- 11/Dockerfile | 14 +++++++------- 12/Dockerfile | 14 +++++++------- 13/Dockerfile | 14 +++++++------- VERSION | 2 +- generate-dockerfiles.sh | 4 ++-- overlay/etc/nu/scripts/bf/pkg.nu | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/11/Dockerfile b/11/Dockerfile index 3d1eaa4..cafc2fa 100644 --- a/11/Dockerfile +++ b/11/Dockerfile @@ -10,7 +10,7 @@ RUN \ echo "Platform: ${TARGETPLATFORM}" >> /log && \ echo "Debian: 11.9" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ - echo "Nushell: 0.92.1" >> /log + echo "Nushell: 0.93.0" >> /log WORKDIR /tmp RUN \ @@ -22,8 +22,8 @@ RUN \ linux/arm64) ARCH="aarch64" ; COMP="gnu" ;; \ *) echo "Unsupported target platform: ${TARGETPLATFORM}." && exit 1 ;; \ esac && \ - NAME=nu-0.92.1-${ARCH}-unknown-linux-${COMP} && \ - URL=https://github.com/nushell/nushell/releases/download/0.92.1/${NAME}.tar.gz && \ + NAME=nu-0.93.0-${ARCH}-unknown-linux-${COMP} && \ + URL=https://github.com/nushell/nushell/releases/download/0.93.0/${NAME}.tar.gz && \ wget ${URL} && \ tar -oxzf ${NAME}.tar.gz && \ mkdir /nu && \ @@ -33,8 +33,8 @@ RUN \ mkdir /nu-plugins && \ mv ${NAME}/nu_plugin* /nu-plugins -ADD https://raw.githubusercontent.com/bfren/nushell/main/0.92.1/config.nu /nu-config/config.nu -ADD https://raw.githubusercontent.com/bfren/nushell/main/0.92.1/env.nu /nu-config/env.nu +ADD https://raw.githubusercontent.com/bfren/nushell/main/0.93.0/config.nu /nu-config/config.nu +ADD https://raw.githubusercontent.com/bfren/nushell/main/0.93.0/env.nu /nu-config/env.nu #====================================================================================================================== @@ -85,7 +85,7 @@ WORKDIR /tmp RUN \ # get the overlay from the Alpine base image echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v2.2.6 https://github.com/bfren/docker-alpine.git && \ + apk add git && git clone --branch v2.2.7 https://github.com/bfren/docker-alpine.git && \ mv docker-alpine/overlay / @@ -115,7 +115,7 @@ ENV \ # 1: yes BF_UPGRADE_PACKAGES=0 \ # Nushell version string to check against installed verion after installation - NUSHELL_VERSION=0.92.1 + NUSHELL_VERSION=0.93.0 RUN \ # setup Nushell using preinstallation script diff --git a/12/Dockerfile b/12/Dockerfile index 4e10298..86cc561 100644 --- a/12/Dockerfile +++ b/12/Dockerfile @@ -10,7 +10,7 @@ RUN \ echo "Platform: ${TARGETPLATFORM}" >> /log && \ echo "Debian: 12.5" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ - echo "Nushell: 0.92.1" >> /log + echo "Nushell: 0.93.0" >> /log WORKDIR /tmp RUN \ @@ -22,8 +22,8 @@ RUN \ linux/arm64) ARCH="aarch64" ; COMP="gnu" ;; \ *) echo "Unsupported target platform: ${TARGETPLATFORM}." && exit 1 ;; \ esac && \ - NAME=nu-0.92.1-${ARCH}-unknown-linux-${COMP} && \ - URL=https://github.com/nushell/nushell/releases/download/0.92.1/${NAME}.tar.gz && \ + NAME=nu-0.93.0-${ARCH}-unknown-linux-${COMP} && \ + URL=https://github.com/nushell/nushell/releases/download/0.93.0/${NAME}.tar.gz && \ wget ${URL} && \ tar -oxzf ${NAME}.tar.gz && \ mkdir /nu && \ @@ -33,8 +33,8 @@ RUN \ mkdir /nu-plugins && \ mv ${NAME}/nu_plugin* /nu-plugins -ADD https://raw.githubusercontent.com/bfren/nushell/main/0.92.1/config.nu /nu-config/config.nu -ADD https://raw.githubusercontent.com/bfren/nushell/main/0.92.1/env.nu /nu-config/env.nu +ADD https://raw.githubusercontent.com/bfren/nushell/main/0.93.0/config.nu /nu-config/config.nu +ADD https://raw.githubusercontent.com/bfren/nushell/main/0.93.0/env.nu /nu-config/env.nu #====================================================================================================================== @@ -85,7 +85,7 @@ WORKDIR /tmp RUN \ # get the overlay from the Alpine base image echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v2.2.6 https://github.com/bfren/docker-alpine.git && \ + apk add git && git clone --branch v2.2.7 https://github.com/bfren/docker-alpine.git && \ mv docker-alpine/overlay / @@ -115,7 +115,7 @@ ENV \ # 1: yes BF_UPGRADE_PACKAGES=0 \ # Nushell version string to check against installed verion after installation - NUSHELL_VERSION=0.92.1 + NUSHELL_VERSION=0.93.0 RUN \ # setup Nushell using preinstallation script diff --git a/13/Dockerfile b/13/Dockerfile index 6892967..ecc58e6 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -10,7 +10,7 @@ RUN \ echo "Platform: ${TARGETPLATFORM}" >> /log && \ echo "Debian: trixie" >> /log && \ echo "Busybox: 1.36.1" >> /log && \ - echo "Nushell: 0.92.1" >> /log + echo "Nushell: 0.93.0" >> /log WORKDIR /tmp RUN \ @@ -22,8 +22,8 @@ RUN \ linux/arm64) ARCH="aarch64" ; COMP="gnu" ;; \ *) echo "Unsupported target platform: ${TARGETPLATFORM}." && exit 1 ;; \ esac && \ - NAME=nu-0.92.1-${ARCH}-unknown-linux-${COMP} && \ - URL=https://github.com/nushell/nushell/releases/download/0.92.1/${NAME}.tar.gz && \ + NAME=nu-0.93.0-${ARCH}-unknown-linux-${COMP} && \ + URL=https://github.com/nushell/nushell/releases/download/0.93.0/${NAME}.tar.gz && \ wget ${URL} && \ tar -oxzf ${NAME}.tar.gz && \ mkdir /nu && \ @@ -33,8 +33,8 @@ RUN \ mkdir /nu-plugins && \ mv ${NAME}/nu_plugin* /nu-plugins -ADD https://raw.githubusercontent.com/bfren/nushell/main/0.92.1/config.nu /nu-config/config.nu -ADD https://raw.githubusercontent.com/bfren/nushell/main/0.92.1/env.nu /nu-config/env.nu +ADD https://raw.githubusercontent.com/bfren/nushell/main/0.93.0/config.nu /nu-config/config.nu +ADD https://raw.githubusercontent.com/bfren/nushell/main/0.93.0/env.nu /nu-config/env.nu #====================================================================================================================== @@ -85,7 +85,7 @@ WORKDIR /tmp RUN \ # get the overlay from the Alpine base image echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v2.2.6 https://github.com/bfren/docker-alpine.git && \ + apk add git && git clone --branch v2.2.7 https://github.com/bfren/docker-alpine.git && \ mv docker-alpine/overlay / @@ -115,7 +115,7 @@ ENV \ # 1: yes BF_UPGRADE_PACKAGES=0 \ # Nushell version string to check against installed verion after installation - NUSHELL_VERSION=0.92.1 + NUSHELL_VERSION=0.93.0 RUN \ # setup Nushell using preinstallation script diff --git a/VERSION b/VERSION index 711ee4f..b532f3d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.3 \ No newline at end of file +3.1.4 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 5b6a959..0675409 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,9 +4,9 @@ set -euo pipefail docker pull bfren/alpine -ALPINE_BRANCH="v2.2.6" +ALPINE_BRANCH="v2.2.7" BUSYBOX_VERSION="1.36.1" -NUSHELL_VERSION="0.92.1" +NUSHELL_VERSION="0.93.0" DEBIAN_VERSIONS="11 12 13" for V in ${DEBIAN_VERSIONS} ; do diff --git a/overlay/etc/nu/scripts/bf/pkg.nu b/overlay/etc/nu/scripts/bf/pkg.nu index d428099..fc51509 100644 --- a/overlay/etc/nu/scripts/bf/pkg.nu +++ b/overlay/etc/nu/scripts/bf/pkg.nu @@ -16,7 +16,7 @@ def action [ let joined = $args | str join " " write debug $"($description): ($joined)." $script try { - with-env [DEBIAN_FRONTEND noninteractive] { + with-env { DEBIAN_FRONTEND: "noninteractive" } { ^apt-get update ^apt-get $cmd -y ...$args }