Skip to content

Commit

Permalink
Merge pull request #88 from infosiftr/bookworm
Browse files Browse the repository at this point in the history
Update to Debian bookworm
  • Loading branch information
tianon committed Jun 13, 2023
2 parents 067704d + 3e552dc commit f8d4db9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye-slim
FROM debian:bookworm-slim

# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
RUN groupadd --system --gid 11211 memcache && useradd --system --gid memcache --uid 11211 memcache
Expand Down Expand Up @@ -70,7 +70,7 @@ RUN set -x \
&& apt-mark auto '.*' > /dev/null \
&& apt-mark manual $savedAptMark > /dev/null \
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { print $(NF-1) }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
Expand Down
4 changes: 2 additions & 2 deletions generate-stackbrew-library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ for variant in debian alpine; do

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

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

0 comments on commit f8d4db9

Please sign in to comment.