Merged
Conversation
Changes: - docker-library/memcached@471a298: Update 1 to alpine 3.19 - docker-library/memcached@9cd87ed: Merge pull request docker-library/memcached#94 from infosiftr/one-template - docker-library/memcached@52c3fa2: Update templating to pin to only major version and use a single template - docker-library/memcached@1cd4fbf: Merge pull request docker-library/memcached#93 from LaurentGoderre/templating - docker-library/memcached@8b76567: Implement jq templating
Diff for 221205b:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9c3b745..67bcbb8 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,10 +3,10 @@ GitRepo: https://github.com/docker-library/memcached.git
Tags: 1.6.22, 1.6, 1, latest, 1.6.22-bookworm, 1.6-bookworm, 1-bookworm, bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b8a7264e4fc952fd71f2fe325908d6ba06e8e061
-Directory: debian
+GitCommit: 52c3fa2f38bc81f2f3ace853a4b059046c32183a
+Directory: 1/debian
-Tags: 1.6.22-alpine, 1.6-alpine, 1-alpine, alpine, 1.6.22-alpine3.18, 1.6-alpine3.18, 1-alpine3.18, alpine3.18
+Tags: 1.6.22-alpine, 1.6-alpine, 1-alpine, alpine, 1.6.22-alpine3.19, 1.6-alpine3.19, 1-alpine3.19, alpine3.19
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b8a7264e4fc952fd71f2fe325908d6ba06e8e061
-Directory: alpine
+GitCommit: 471a2986706be906753f3b271a55c54391667cbb
+Directory: 1/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index e4f18b4..3d25a85 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,16 +1,16 @@
memcached:1
memcached:1-alpine
-memcached:1-alpine3.18
+memcached:1-alpine3.19
memcached:1-bookworm
memcached:1.6
memcached:1.6-alpine
-memcached:1.6-alpine3.18
+memcached:1.6-alpine3.19
memcached:1.6-bookworm
memcached:1.6.22
memcached:1.6.22-alpine
-memcached:1.6.22-alpine3.18
+memcached:1.6.22-alpine3.19
memcached:1.6.22-bookworm
memcached:alpine
-memcached:alpine3.18
+memcached:alpine3.19
memcached:bookworm
memcached:latest
diff --git a/memcached_alpine3.18/Dockerfile b/memcached_alpine3.19/Dockerfile
similarity index 52%
rename from memcached_alpine3.18/Dockerfile
rename to memcached_alpine3.19/Dockerfile
index ebec1e5..7c9ec08 100644
--- a/memcached_alpine3.18/Dockerfile
+++ b/memcached_alpine3.19/Dockerfile
@@ -1,20 +1,30 @@
-FROM alpine:3.18
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+FROM alpine:3.19
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN addgroup -g 11211 memcache && adduser -D -u 11211 -G memcache memcache
+RUN set -eux; \
+ addgroup -g 11211 memcache; \
+ adduser -D -u 11211 -G memcache memcache
# ensure SASL's "libplain.so" is installed as per https://github.com/memcached/memcached/wiki/SASLHowto
RUN apk add --no-cache libsasl
ENV MEMCACHED_VERSION 1.6.22
+ENV MEMCACHED_URL https://memcached.org/files/memcached-1.6.22.tar.gz
ENV MEMCACHED_SHA1 7a691f390d59616dbebfc9e2e4942d499c39a338
-RUN set -x \
+RUN set -eux; \
\
- && apk add --no-cache --virtual .build-deps \
+ apk add --no-cache --virtual .build-deps \
ca-certificates \
coreutils \
cyrus-sasl-dev \
+ dpkg-dev dpkg \
gcc \
libc-dev \
libevent-dev \
@@ -25,40 +35,44 @@ RUN set -x \
perl \
perl-io-socket-ssl \
perl-utils \
+ ; \
\
- && wget -O memcached.tar.gz "https://memcached.org/files/memcached-$MEMCACHED_VERSION.tar.gz" \
- && echo "$MEMCACHED_SHA1 memcached.tar.gz" | sha1sum -c - \
- && mkdir -p /usr/src/memcached \
- && tar -xzf memcached.tar.gz -C /usr/src/memcached --strip-components=1 \
- && rm memcached.tar.gz \
+ wget -O memcached.tar.gz "$MEMCACHED_URL"; \
+ echo "$MEMCACHED_SHA1 memcached.tar.gz" | sha1sum -c -; \
+ mkdir -p /usr/src/memcached; \
+ tar -xzf memcached.tar.gz -C /usr/src/memcached --strip-components=1; \
+ rm memcached.tar.gz; \
\
- && cd /usr/src/memcached \
+ cd /usr/src/memcached; \
\
- && ./configure \
+ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ ./configure \
--build="$gnuArch" \
--enable-extstore \
--enable-sasl \
--enable-sasl-pwdb \
--enable-tls \
- && nproc="$(nproc)" \
- && make -j "$nproc" \
+ ; \
+ nproc="$(nproc)"; \
+ make -j "$nproc"; \
\
- && make test PARALLEL="$nproc" \
+ make test PARALLEL="$nproc"; \
\
- && make install \
+ make install; \
\
- && cd / && rm -rf /usr/src/memcached \
+ cd /; \
+ rm -rf /usr/src/memcached; \
\
- && runDeps="$( \
+ runDeps="$( \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
- )" \
- && apk add --no-network --virtual .memcached-rundeps $runDeps \
- && apk del --no-network .build-deps \
+ )"; \
+ apk add --no-network --virtual .memcached-rundeps $runDeps; \
+ apk del --no-network .build-deps; \
\
- && memcached -V
+ memcached -V
COPY docker-entrypoint.sh /usr/local/bin/
RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
diff --git a/memcached_alpine3.18/docker-entrypoint.sh b/memcached_alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from memcached_alpine3.18/docker-entrypoint.sh
rename to memcached_alpine3.19/docker-entrypoint.sh
diff --git a/memcached_bookworm/Dockerfile b/memcached_bookworm/Dockerfile
index bd41ec1..999c90a 100644
--- a/memcached_bookworm/Dockerfile
+++ b/memcached_bookworm/Dockerfile
@@ -1,7 +1,15 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
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
+RUN set -eux; \
+ groupadd --system --gid 11211 memcache; \
+ useradd --system --gid memcache --uid 11211 memcache
# ensure SASL's "libplain.so" is installed as per https://github.com/memcached/memcached/wiki/SASLHowto
RUN set -eux; \
@@ -12,13 +20,14 @@ RUN set -eux; \
rm -rf /var/lib/apt/lists/*
ENV MEMCACHED_VERSION 1.6.22
+ENV MEMCACHED_URL https://memcached.org/files/memcached-1.6.22.tar.gz
ENV MEMCACHED_SHA1 7a691f390d59616dbebfc9e2e4942d499c39a338
-RUN set -x \
+RUN set -eux; \
\
- && savedAptMark="$(apt-mark showmanual)" \
- && apt-get update \
- && apt-get install -y --no-install-recommends \
+ savedAptMark="$(apt-mark showmanual)"; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends \
ca-certificates \
dpkg-dev \
gcc \
@@ -30,55 +39,51 @@ RUN set -x \
make \
perl \
wget \
- && rm -rf /var/lib/apt/lists/* \
+ ; \
+ rm -rf /var/lib/apt/lists/*; \
\
- && wget -O memcached.tar.gz "https://memcached.org/files/memcached-$MEMCACHED_VERSION.tar.gz" \
- && echo "$MEMCACHED_SHA1 memcached.tar.gz" | sha1sum -c - \
- && mkdir -p /usr/src/memcached \
- && tar -xzf memcached.tar.gz -C /usr/src/memcached --strip-components=1 \
- && rm memcached.tar.gz \
+ wget -O memcached.tar.gz "$MEMCACHED_URL"; \
+ echo "$MEMCACHED_SHA1 memcached.tar.gz" | sha1sum -c -; \
+ mkdir -p /usr/src/memcached; \
+ tar -xzf memcached.tar.gz -C /usr/src/memcached --strip-components=1; \
+ rm memcached.tar.gz; \
\
- && cd /usr/src/memcached \
+ cd /usr/src/memcached; \
\
- && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
- && enableExtstore="$( \
-# https://github.com/docker-library/memcached/pull/38
- case "$gnuArch" in \
-# https://github.com/memcached/memcached/issues/381 "--enable-extstore on s390x (IBM System Z mainframe architecture) fails tests"
- s390x-*) ;; \
- *) echo '--enable-extstore' ;; \
- esac \
- )" \
- && ./configure \
+ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ ./configure \
--build="$gnuArch" \
+ --enable-extstore \
--enable-sasl \
--enable-sasl-pwdb \
--enable-tls \
- $enableExtstore \
- && nproc="$(nproc)" \
- && make -j "$nproc" \
+ ; \
+ nproc="$(nproc)"; \
+ make -j "$nproc"; \
\
# see https://github.com/docker-library/memcached/pull/54#issuecomment-562797748 and https://bugs.debian.org/927461 for why we have to munge openssl.cnf
- && sed -i.bak 's/SECLEVEL=2/SECLEVEL=1/g' /etc/ssl/openssl.cnf \
- && make test PARALLEL="$nproc" \
- && mv /etc/ssl/openssl.cnf.bak /etc/ssl/openssl.cnf \
+ sed -i.bak 's/SECLEVEL=2/SECLEVEL=1/g' /etc/ssl/openssl.cnf; \
+ make test PARALLEL="$nproc"; \
+ mv /etc/ssl/openssl.cnf.bak /etc/ssl/openssl.cnf; \
\
- && make install \
+ make install; \
\
- && cd / && rm -rf /usr/src/memcached \
+ cd /; \
+ rm -rf /usr/src/memcached; \
\
- && apt-mark auto '.*' > /dev/null \
- && apt-mark manual $savedAptMark > /dev/null \
- && find /usr/local -type f -executable -exec ldd '{}' ';' \
+ apt-mark auto '.*' > /dev/null; \
+ apt-mark manual $savedAptMark > /dev/null; \
+ find /usr/local -type f -executable -exec ldd '{}' ';' \
| 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 \
| sort -u \
| xargs -r apt-mark manual \
- && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+ ; \
+ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
\
- && memcached -V
+ memcached -V
COPY docker-entrypoint.sh /usr/local/bin/
RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compatRelevant Maintainers: |
Contributor
|
Is the shift from |
Member
Yup, that was part of docker-library/memcached#94. |
yosifkit
approved these changes
Dec 12, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes: