Skip to content

Commit

Permalink
v2.8.2 (#137)
Browse files Browse the repository at this point in the history
Minor updates
* Updating to Nushell 0.102.0
* Removing Nu plugins
* Fixing new runtime errors
  • Loading branch information
bfren authored Feb 7, 2025
1 parent 4a128d5 commit cfa7bb5
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 30 deletions.
6 changes: 3 additions & 3 deletions 3.15/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN \
echo "Platform: ${TARGETPLATFORM}" >> /log && \
echo "Alpine: 3.15.11" >> /log && \
echo "Busybox: 1.36.1" >> /log && \
echo "Nushell: 0.101.0" >> /log
echo "Nushell: 0.102.0" >> /log


#======================================================================================================================
Expand All @@ -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.101.0-alpine-250124 AS nushell
FROM ghcr.io/bfren/nushell:0.102.0-alpine-250124 AS nushell


#======================================================================================================================
Expand Down Expand Up @@ -53,7 +53,7 @@ ENV \
# 1: yes
BF_UPGRADE_PACKAGES=0 \
# Nushell version string to check against installed verion after installation
NU_VERSION=0.101.0
NU_VERSION=0.102.0

RUN \
# add packages required by Nushell
Expand Down
6 changes: 3 additions & 3 deletions 3.16/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN \
echo "Platform: ${TARGETPLATFORM}" >> /log && \
echo "Alpine: 3.16.9" >> /log && \
echo "Busybox: 1.36.1" >> /log && \
echo "Nushell: 0.101.0" >> /log
echo "Nushell: 0.102.0" >> /log


#======================================================================================================================
Expand All @@ -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.101.0-alpine-250124 AS nushell
FROM ghcr.io/bfren/nushell:0.102.0-alpine-250124 AS nushell


#======================================================================================================================
Expand Down Expand Up @@ -53,7 +53,7 @@ ENV \
# 1: yes
BF_UPGRADE_PACKAGES=0 \
# Nushell version string to check against installed verion after installation
NU_VERSION=0.101.0
NU_VERSION=0.102.0

RUN \
# add packages required by Nushell
Expand Down
6 changes: 3 additions & 3 deletions 3.17/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN \
echo "Platform: ${TARGETPLATFORM}" >> /log && \
echo "Alpine: 3.17.10" >> /log && \
echo "Busybox: 1.36.1" >> /log && \
echo "Nushell: 0.101.0" >> /log
echo "Nushell: 0.102.0" >> /log


#======================================================================================================================
Expand All @@ -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.101.0-alpine-250124 AS nushell
FROM ghcr.io/bfren/nushell:0.102.0-alpine-250124 AS nushell


#======================================================================================================================
Expand Down Expand Up @@ -53,7 +53,7 @@ ENV \
# 1: yes
BF_UPGRADE_PACKAGES=0 \
# Nushell version string to check against installed verion after installation
NU_VERSION=0.101.0
NU_VERSION=0.102.0

RUN \
# add packages required by Nushell
Expand Down
6 changes: 3 additions & 3 deletions 3.18/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN \
echo "Platform: ${TARGETPLATFORM}" >> /log && \
echo "Alpine: 3.18.11" >> /log && \
echo "Busybox: 1.36.1" >> /log && \
echo "Nushell: 0.101.0" >> /log
echo "Nushell: 0.102.0" >> /log


#======================================================================================================================
Expand All @@ -24,7 +24,7 @@ FROM ghcr.io/bfren/busybox:1.36.1-alpine3.18.11-240913 AS busybox
# STAGE 2: load Nushell
#======================================================================================================================

FROM ghcr.io/bfren/nushell:0.101.0-alpine-250124 AS nushell
FROM ghcr.io/bfren/nushell:0.102.0-alpine-250124 AS nushell


#======================================================================================================================
Expand Down Expand Up @@ -53,7 +53,7 @@ ENV \
# 1: yes
BF_UPGRADE_PACKAGES=0 \
# Nushell version string to check against installed verion after installation
NU_VERSION=0.101.0
NU_VERSION=0.102.0

RUN \
# add packages required by Nushell
Expand Down
6 changes: 3 additions & 3 deletions 3.19/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN \
echo "Platform: ${TARGETPLATFORM}" >> /log && \
echo "Alpine: 3.19.6" >> /log && \
echo "Busybox: 1.36.1" >> /log && \
echo "Nushell: 0.101.0" >> /log
echo "Nushell: 0.102.0" >> /log


#======================================================================================================================
Expand All @@ -24,7 +24,7 @@ FROM ghcr.io/bfren/busybox:1.36.1-alpine3.19.6-240913 AS busybox
# STAGE 2: load Nushell
#======================================================================================================================

FROM ghcr.io/bfren/nushell:0.101.0-alpine-250124 AS nushell
FROM ghcr.io/bfren/nushell:0.102.0-alpine-250124 AS nushell


#======================================================================================================================
Expand Down Expand Up @@ -53,7 +53,7 @@ ENV \
# 1: yes
BF_UPGRADE_PACKAGES=0 \
# Nushell version string to check against installed verion after installation
NU_VERSION=0.101.0
NU_VERSION=0.102.0

RUN \
# add packages required by Nushell
Expand Down
6 changes: 3 additions & 3 deletions 3.20/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN \
echo "Platform: ${TARGETPLATFORM}" >> /log && \
echo "Alpine: 3.20.5" >> /log && \
echo "Busybox: 1.36.1" >> /log && \
echo "Nushell: 0.101.0" >> /log
echo "Nushell: 0.102.0" >> /log


#======================================================================================================================
Expand All @@ -24,7 +24,7 @@ FROM ghcr.io/bfren/busybox:1.36.1-alpine3.20.5-240913 AS busybox
# STAGE 2: load Nushell
#======================================================================================================================

FROM ghcr.io/bfren/nushell:0.101.0-alpine-250124 AS nushell
FROM ghcr.io/bfren/nushell:0.102.0-alpine-250124 AS nushell


#======================================================================================================================
Expand Down Expand Up @@ -53,7 +53,7 @@ ENV \
# 1: yes
BF_UPGRADE_PACKAGES=0 \
# Nushell version string to check against installed verion after installation
NU_VERSION=0.101.0
NU_VERSION=0.102.0

RUN \
# add packages required by Nushell
Expand Down
6 changes: 3 additions & 3 deletions 3.21/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN \
echo "Platform: ${TARGETPLATFORM}" >> /log && \
echo "Alpine: 3.21.2" >> /log && \
echo "Busybox: 1.36.1" >> /log && \
echo "Nushell: 0.101.0" >> /log
echo "Nushell: 0.102.0" >> /log


#======================================================================================================================
Expand All @@ -24,7 +24,7 @@ FROM ghcr.io/bfren/busybox:1.36.1-alpine3.21.2-240913 AS busybox
# STAGE 2: load Nushell
#======================================================================================================================

FROM ghcr.io/bfren/nushell:0.101.0-alpine-250124 AS nushell
FROM ghcr.io/bfren/nushell:0.102.0-alpine-250124 AS nushell


#======================================================================================================================
Expand Down Expand Up @@ -53,7 +53,7 @@ ENV \
# 1: yes
BF_UPGRADE_PACKAGES=0 \
# Nushell version string to check against installed verion after installation
NU_VERSION=0.101.0
NU_VERSION=0.102.0

RUN \
# add packages required by Nushell
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.8.1
2.8.2
2 changes: 1 addition & 1 deletion generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ docker pull bfren/alpine

BUSYBOX_VERSION="1.36.1"
BUSYBOX_BUILD="240913"
NU_VERSION="0.101.0"
NU_VERSION="0.102.0"
NU_BUILD="250124"
ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21"

Expand Down
4 changes: 2 additions & 2 deletions overlay/etc/nu/scripts/bf/ch.nu
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ export def apply []: [string -> nothing, list<string> -> nothing] {
# get values - path and owner are required, fmode and dmode are optional
let path = $row | get 0
let owner = $row | get 1
let fmode = $row | get -i 2 | into string
let dmode = $row | get -i 3 | into string
let fmode = $row | get -i 2 | default "" | into string
let dmode = $row | get -i 3 | default "" | into string

# apply ownership changes
apply_own_recurse $path $owner
Expand Down
10 changes: 5 additions & 5 deletions overlay/etc/nu/scripts/bf/install.nu
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ export def main []: nothing -> nothing {
write "Setting permissions." install
env apply_perms
let root = "root:root"
["/etc/nu" $root 0666 0777] | ch apply
["/init" $root 0500 ] | ch apply
["/test" $root 0500 ] | ch apply
["/tmp" $root 1777 1777] | ch apply
["/usr/bin/bf" $root 0555] | ch apply
["/etc/nu" $root "0666" "0777"] | ch apply
["/init" $root "0500"] | ch apply
["/test" $root "0500"] | ch apply
["/tmp" $root "1777" "1777"] | ch apply
["/usr/bin/bf" $root "0555"] | ch apply

# run install script in /tmp
const install = "/tmp/install"
Expand Down
1 change: 1 addition & 0 deletions overlay/preinstall
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ ln -sf ${NU}/scripts ${CFG}/scripts
#======================================================================================================================

rm -rf ${CFG}/plugins
rm -rf /usr/bin/nu_plugin_*


#======================================================================================================================
Expand Down

0 comments on commit cfa7bb5

Please sign in to comment.