Skip to content

Commit

Permalink
Update to Debian 12.2, BusyBox 1.36.1
Browse files Browse the repository at this point in the history
Signed-off-by: Marcel Bargull <[email protected]>
  • Loading branch information
mbargull committed Oct 16, 2023
1 parent c107d99 commit b9ad319
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/base-glibc-busybox-bash.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
# version tags or checksum IDs, but not via "latest".
IMAGE_VERSION: '3.0.0'
IMAGE_NAME: base-glibc-busybox-bash
BUSYBOX_VERSION: '1.32.1'
DEBIAN_VERSION: '10.9'
BUSYBOX_VERSION: '1.36.1'
DEBIAN_VERSION: '12.2'

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/base-glibc-debian-bash.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
# version tags or checksum IDs, but not via "latest".
IMAGE_VERSION: '3.0.0'
IMAGE_NAME: base-glibc-debian-bash
DEBIAN_VERSION: '10.9'
DEBIAN_VERSION: '12.2'

steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 1 addition & 3 deletions images/base-glibc-busybox-bash/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
ARG busybox_version=1.32.1
ARG debian_version=10.8

# Don't use Debian's busybox package since it only provides a smaller subset of
# BusyBox's functions (e.g., no administrative tools like adduser etc.).
# Since we create a glibc image anyway, we can also use a the slightly smaller
# dynamically linked binary.

ARG debian_version
FROM "debian:${debian_version}-slim" AS build_base
RUN [ ! -f /etc/apt/sources.list ] || sed --in-place= --regexp-extended \
'/ stretch/ { /-updates/d ; s,/(deb|security)\.,/archive., }' \
Expand Down
2 changes: 1 addition & 1 deletion images/base-glibc-debian-bash/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG debian_version=10.8
ARG debian_version

FROM "debian:${debian_version}-slim"
RUN [ ! -f /etc/apt/sources.list ] || sed --in-place= --regexp-extended \
Expand Down

0 comments on commit b9ad319

Please sign in to comment.