Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update memcached #14858

Merged
merged 1 commit into from
Jun 14, 2023
Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 14, 2023

Changes:

Changes:

- docker-library/memcached@f8d4db9: Merge pull request docker-library/memcached#88 from infosiftr/bookworm
- docker-library/memcached@3e552dc: Update to Debian bookworm
@github-actions
Copy link

Diff for e6aee67:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 11d63b6..841f122 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,9 +1,9 @@
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/memcached.git
 
-Tags: 1.6.20, 1.6, 1, latest, 1.6.20-bullseye, 1.6-bullseye, 1-bullseye, bullseye
+Tags: 1.6.20, 1.6, 1, latest, 1.6.20-bookworm, 1.6-bookworm, 1-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 067704d799d434d12ad73b1334358e1b6d4cf8b5
+GitCommit: 3e552dc7c3907467c258c986cb4763a544ee3041
 Directory: debian
 
 Tags: 1.6.20-alpine, 1.6-alpine, 1-alpine, alpine, 1.6.20-alpine3.18, 1.6-alpine3.18, 1-alpine3.18, alpine3.18
diff --git a/_bashbrew-list b/_bashbrew-list
index 3a1f1da..c9c2b48 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,16 +1,16 @@
 memcached:1
 memcached:1-alpine
 memcached:1-alpine3.18
-memcached:1-bullseye
+memcached:1-bookworm
 memcached:1.6
 memcached:1.6-alpine
 memcached:1.6-alpine3.18
-memcached:1.6-bullseye
+memcached:1.6-bookworm
 memcached:1.6.20
 memcached:1.6.20-alpine
 memcached:1.6.20-alpine3.18
-memcached:1.6.20-bullseye
+memcached:1.6.20-bookworm
 memcached:alpine
 memcached:alpine3.18
-memcached:bullseye
+memcached:bookworm
 memcached:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 0a69561..f65665f 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,2 +1,2 @@
-memcached:bullseye
+memcached:bookworm
 memcached:alpine3.18
diff --git a/memcached_bullseye/Dockerfile b/memcached_bookworm/Dockerfile
similarity index 94%
rename from memcached_bullseye/Dockerfile
rename to memcached_bookworm/Dockerfile
index eaf01a3..7ad4de1 100644
--- a/memcached_bullseye/Dockerfile
+++ b/memcached_bookworm/Dockerfile
@@ -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
@@ -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 \
diff --git a/memcached_bullseye/docker-entrypoint.sh b/memcached_bookworm/docker-entrypoint.sh
similarity index 100%
rename from memcached_bullseye/docker-entrypoint.sh
rename to memcached_bookworm/docker-entrypoint.sh

Relevant Maintainers:

@yosifkit yosifkit merged commit 6f22ecb into docker-library:master Jun 14, 2023
@yosifkit yosifkit deleted the memcached branch June 14, 2023 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants