Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/auto-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
-
name: Checkout Branch ${{ github.ref_name }}
uses: actions/checkout@v6
uses: actions/checkout@v7
-
name: Create Pull Request
run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}."
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
-
name: Checkout code
uses: actions/checkout@v6
uses: actions/checkout@v7
-
name: Get repository name
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
Expand Down Expand Up @@ -50,27 +50,27 @@ jobs:
id: version
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
-
name: Login to DockerHub
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Login to Quay.io Container Registry
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: quay.io
username: ${{ github.repository_owner }}
password: ${{ secrets.QUAY_TOKEN }}
-
name: Build and export
id: docker_export
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
file: ./${{ matrix.debian }}/Dockerfile
build-args: |
Expand All @@ -86,7 +86,7 @@ jobs:
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
context: .
file: ./${{ matrix.debian }}/Dockerfile
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
name: Build and push default tags
id: docker_build_default
if: matrix.debian == '13'
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
context: .
file: ./${{ matrix.debian }}/Dockerfile
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
-
name: Checkout code
uses: actions/checkout@v6
uses: actions/checkout@v7
-
name: Get repository name
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
Expand Down Expand Up @@ -52,27 +52,27 @@ jobs:
id: version
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
-
name: Login to DockerHub
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Login to Quay.io Container Registry
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: quay.io
username: ${{ github.repository_owner }}
password: ${{ secrets.QUAY_TOKEN }}
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
context: .
file: ./${{ matrix.debian }}/Dockerfile
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
-
name: Build and push default tags
id: docker_build_default
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
if: matrix.debian == '13'
with:
context: .
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
shell: bash
-
name: Checkout code
uses: actions/checkout@v6
uses: actions/checkout@v7
-
name: Login to DockerHub
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion 12/DEBIAN_MINOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.14
12.15
14 changes: 7 additions & 7 deletions 12/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ ARG TARGETPLATFORM
RUN \
# save platform and version information to log
echo "Platform: ${TARGETPLATFORM}" >> /log && \
echo "Debian: 12.14" >> /log && \
echo "Debian: 12.15" >> /log && \
echo "Busybox: 1.36.1" >> /log && \
echo "Nushell: 0.114.1" >> /log
echo "Nushell: 0.113.1" >> /log


#======================================================================================================================
# STAGE 1: load busybox
#======================================================================================================================

FROM quay.io/bfren/busybox:1.36.1-debian12.14-260128 AS busybox
FROM quay.io/bfren/busybox:1.36.1-debian12.15-260128 AS busybox


#======================================================================================================================
# STAGE 2: load Nushell
#======================================================================================================================

FROM quay.io/bfren/nushell:0.114.1-bookworm-260421 AS nushell
FROM quay.io/bfren/nushell:0.113.1-bookworm-260421 AS nushell


#======================================================================================================================
Expand All @@ -37,15 +37,15 @@ WORKDIR /tmp
RUN \
# get the overlay from the Alpine base image
echo "Cloning Alpine overlay." && \
apk add git && git clone --branch v3.2.2 https://github.com/bfren/docker-alpine.git && \
apk add git && git clone --branch v3.3.0 https://github.com/bfren/docker-alpine.git && \
mv docker-alpine/overlay /


#======================================================================================================================
# STAGE 4: install bfren platform
#======================================================================================================================

FROM debian:12.14-slim AS install
FROM debian:12.15-slim AS install
COPY --from=build /log /etc/bf/BUILD
COPY --from=alpine /overlay /
COPY --from=busybox / /bin
Expand All @@ -67,7 +67,7 @@ ENV \
# 1: yes
BF_UPGRADE_PACKAGES=0 \
# Nushell version string to check against installed verion after installation
NU_VERSION=0.114.1
NU_VERSION=0.113.1

RUN \
# delete all binaries that will be replaced by busybox - those in ${IGNORE} will be left alone
Expand Down
2 changes: 1 addition & 1 deletion 13/DEBIAN_MINOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
13.5
13.6
14 changes: 7 additions & 7 deletions 13/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ ARG TARGETPLATFORM
RUN \
# save platform and version information to log
echo "Platform: ${TARGETPLATFORM}" >> /log && \
echo "Debian: 13.5" >> /log && \
echo "Debian: 13.6" >> /log && \
echo "Busybox: 1.36.1" >> /log && \
echo "Nushell: 0.114.1" >> /log
echo "Nushell: 0.113.1" >> /log


#======================================================================================================================
# STAGE 1: load busybox
#======================================================================================================================

FROM quay.io/bfren/busybox:1.36.1-debian13.5-260128 AS busybox
FROM quay.io/bfren/busybox:1.36.1-debian13.6-260128 AS busybox


#======================================================================================================================
# STAGE 2: load Nushell
#======================================================================================================================

FROM quay.io/bfren/nushell:0.114.1-trixie-260421 AS nushell
FROM quay.io/bfren/nushell:0.113.1-trixie-260421 AS nushell


#======================================================================================================================
Expand All @@ -37,15 +37,15 @@ WORKDIR /tmp
RUN \
# get the overlay from the Alpine base image
echo "Cloning Alpine overlay." && \
apk add git && git clone --branch v3.2.2 https://github.com/bfren/docker-alpine.git && \
apk add git && git clone --branch v3.3.0 https://github.com/bfren/docker-alpine.git && \
mv docker-alpine/overlay /


#======================================================================================================================
# STAGE 4: install bfren platform
#======================================================================================================================

FROM debian:13.5-slim AS install
FROM debian:13.6-slim AS install
COPY --from=build /log /etc/bf/BUILD
COPY --from=alpine /overlay /
COPY --from=busybox / /bin
Expand All @@ -67,7 +67,7 @@ ENV \
# 1: yes
BF_UPGRADE_PACKAGES=0 \
# Nushell version string to check against installed verion after installation
NU_VERSION=0.114.1
NU_VERSION=0.113.1

RUN \
# delete all binaries that will be replaced by busybox - those in ${IGNORE} will be left alone
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.1.14
5.2.0
2 changes: 1 addition & 1 deletion VERSION_MINOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.1
5.2
4 changes: 2 additions & 2 deletions generate-dockerfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ set -euo pipefail

docker pull bfren/alpine

ALPINE_BRANCH="v3.2.2"
ALPINE_BRANCH="v3.3.0"
BUSYBOX_VERSION="1.36.1"
BUSYBOX_BUILD="260128"
NU_VERSION="0.114.1"
NU_VERSION="0.113.1"
NU_BUILD="260421"
DEBIAN_VERSIONS="12 13"

Expand Down
2 changes: 1 addition & 1 deletion overlay/etc/nu/scripts/bf/pkg.nu
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def action [
^apt-get $cmd -y ...$args
}
} catch {
write error $"Error ($description | str lowercase) packages: ($joined)." $script
write error $"Error ($description | str downcase) packages: ($joined)." $script
}
}

Expand Down