Skip to content

Commit f8d4db9

Browse files
authored
Merge pull request #88 from infosiftr/bookworm
Update to Debian bookworm
2 parents 067704d + 3e552dc commit f8d4db9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

debian/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bullseye-slim
1+
FROM debian:bookworm-slim
22

33
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
44
RUN groupadd --system --gid 11211 memcache && useradd --system --gid memcache --uid 11211 memcache
@@ -70,7 +70,7 @@ RUN set -x \
7070
&& apt-mark auto '.*' > /dev/null \
7171
&& apt-mark manual $savedAptMark > /dev/null \
7272
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
73-
| awk '/=>/ { print $(NF-1) }' \
73+
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
7474
| sort -u \
7575
| xargs -r dpkg-query --search \
7676
| cut -d: -f1 \

generate-stackbrew-library.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ for variant in debian alpine; do
8181

8282
parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$variant/Dockerfile")"
8383

84-
suite="${parent#*:}" # "bullseye-slim", "bullseye"
85-
suite="${suite%-slim}" # "bullseye"
84+
suite="${parent#*:}" # "bookworm-slim", "bookworm"
85+
suite="${suite%-slim}" # "bookworm"
8686
if [ "$variant" = 'alpine' ]; then
8787
suite="alpine$suite" # "alpine3.14"
8888
suiteAliases=( "${versionAliases[@]/%/-$suite}" )

0 commit comments

Comments
 (0)