Skip to content

Commit

Permalink
v4.0.0 (#81)
Browse files Browse the repository at this point in the history
Major updates
* Removing support for bullseye
* Adding arm/v7 builds

Minor updates
* Updating to Nushell 0.101.0

Documentation updates
* Updating copyright year to 2025
  • Loading branch information
bfren authored Jan 24, 2025
1 parent df2a06b commit 364341e
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 139 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
debian: [ "11", "12" ]
debian: [ "12" ]
runs-on: ubuntu-latest
steps:
-
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
BF_IMAGE=${{ env.REPOSITORY_NAME }}
BF_VERSION=${{ steps.version.outputs.contents }}
push: ${{ startsWith(github.ref, 'refs/heads/') }}
platforms: linux/amd64,linux/arm64/v8
platforms: linux/amd64,linux/arm/v7,linux/arm64
tags: |
bfren/debian:debian${{ matrix.debian }}-dev
bfren/debian:debian${{ matrix.debian }}-${{ steps.version_major.outputs.contents }}-dev
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
BF_IMAGE=${{ env.REPOSITORY_NAME }}
BF_VERSION=${{ steps.version.outputs.contents }}
push: ${{ startsWith(github.ref, 'refs/heads/') }}
platforms: linux/amd64,linux/arm64/v8
platforms: linux/amd64,linux/arm/v7,linux/arm64
tags: |
bfren/debian:dev
bfren/debian:${{ steps.version_major.outputs.contents }}-dev
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
debian: [ "11", "12" ]
debian: [ "12" ]
runs-on: ubuntu-latest
steps:
-
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
BF_PUBLISHING=1
BF_VERSION=${{ steps.version.outputs.contents }}
push: true
platforms: linux/amd64,linux/arm64/v8
platforms: linux/amd64,linux/arm/v7,linux/arm64
tags: |
bfren/debian:debian${{ matrix.debian }}
bfren/debian:debian${{ matrix.debian }}-${{ steps.version_major.outputs.contents }}
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
BF_PUBLISHING=1
BF_VERSION=${{ steps.version.outputs.contents }}
push: true
platforms: linux/amd64,linux/arm64/v8
platforms: linux/amd64,linux/arm/v7,linux/arm64
tags: |
bfren/debian:latest
bfren/debian:${{ steps.version_major.outputs.contents }}
Expand Down
1 change: 0 additions & 1 deletion 11/DEBIAN_MINOR

This file was deleted.

1 change: 0 additions & 1 deletion 11/DEBIAN_NAME

This file was deleted.

114 changes: 0 additions & 114 deletions 11/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion 12/DEBIAN_MINOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.8
12.9
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.8" >> /log && \
echo "Debian: 12.9" >> /log && \
echo "Busybox: 1.36.1" >> /log && \
echo "Nushell: 0.100.0" >> /log
echo "Nushell: 0.101.0" >> /log


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

FROM ghcr.io/bfren/busybox:1.36.1-debian12.8-240913 AS busybox
FROM ghcr.io/bfren/busybox:1.36.1-debian12.9-240913 AS busybox


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

FROM ghcr.io/bfren/nushell:0.100.0-bookworm-241018 AS nushell
FROM ghcr.io/bfren/nushell:0.101.0-bookworm-250124 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 v2.8.0 https://github.com/bfren/docker-alpine.git && \
apk add git && git clone --branch v2.8.1 https://github.com/bfren/docker-alpine.git && \
mv docker-alpine/overlay /


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

FROM debian:12.8-slim AS install
FROM debian:12.9-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.100.0
NU_VERSION=0.101.0

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 LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT Licence

Copyright (c) 2022-2024 bfren
Copyright (c) 2022-2025 bfren

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
## Copyright

> Copyright (c) 2022-2024 [bfren](https://bfren.dev) (unless otherwise stated)
> Copyright (c) 2022-2025 [bfren](https://bfren.dev) (unless otherwise stated)
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.7
4.0.0
2 changes: 1 addition & 1 deletion VERSION_MAJOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3
4
2 changes: 1 addition & 1 deletion VERSION_MINOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3
4.0
8 changes: 4 additions & 4 deletions generate-dockerfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ set -euo pipefail

docker pull bfren/alpine

ALPINE_BRANCH="v2.8.0"
ALPINE_BRANCH="v2.8.1"
BUSYBOX_VERSION="1.36.1"
BUSYBOX_BUILD="240913"
NU_VERSION="0.100.0"
NU_BUILD="241018"
DEBIAN_VERSIONS="11 12"
NU_VERSION="0.101.0"
NU_BUILD="250124"
DEBIAN_VERSIONS="12"

for V in ${DEBIAN_VERSIONS} ; do

Expand Down

0 comments on commit 364341e

Please sign in to comment.