Skip to content

Commit 41e2850

Browse files
committed
Apply stop_time restart patch
This fixes the arm32 Alpine build/test failures, which are also thus re-enabled here.
1 parent 70a1ff5 commit 41e2850

File tree

4 files changed

+21
-7
lines changed

4 files changed

+21
-7
lines changed

1/alpine/Dockerfile

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

1/debian/Dockerfile

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@ RUN set -eux; \
9595
patch --input="$PWD/memcached-extstore-test-stability.patch" --strip=1 --directory=/usr/src/memcached; \
9696
rm memcached-extstore-test-stability.patch; \
9797
\
98+
# https://github.com/memcached/memcached/issues/799
99+
# https://github.com/memcached/memcached/pull/1237
100+
wget -O memcached-stop_time.patch 'https://github.com/memcached/memcached/commit/37c94672231c471de2d75ff73f46ec9e72f15f44.patch?full_index=1'; \
101+
echo '9d33a0c277b406fd79303ff58eab205a3a54ae2b4431ba239fb99a46a1903eff *memcached-stop_time.patch' | sha256sum -c -; \
102+
patch --input="$PWD/memcached-stop_time.patch" --strip=1 --directory=/usr/src/memcached; \
103+
rm memcached-stop_time.patch; \
104+
\
98105
{{ ) else "" end -}}
99106
cd /usr/src/memcached; \
100107
\

generate-stackbrew-library.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,6 @@ for version; do
108108
suiteAliases=( "${suiteAliases[@]//latest-/}" )
109109
variantAliases+=( "${suiteAliases[@]}" )
110110

111-
if [ "$variant" = 'alpine' ]; then
112-
# https://github.com/memcached/memcached/issues/799
113-
# https://github.com/docker-library/memcached/issues/69
114-
arches="$(sed -r -e 's/ arm32v6 / /g' <<<" $arches ")"
115-
arches="$(sed -r -e 's/ arm32v7 / /g' <<<" $arches ")"
116-
fi
117-
118111
echo
119112
cat <<-EOE
120113
Tags: $(join ', ' "${variantAliases[@]}")

0 commit comments

Comments
 (0)