Add initial templating #216
Merged
Conversation
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
Contributor
|
The diff between |
The only wrinkle was the protected-mode changes for 6.0+, but I handled them similar to what we do in PHP for multiple variants off the same template.
Contributor
Author
|
They're very similar, but IMO just different enough that I think having two templates that we $ diff -u Dockerfile.template Dockerfile-32bit.template
--- Dockerfile.template 2019-12-27 16:35:33.843311801 -0800
+++ Dockerfile-32bit.template 2019-12-27 16:37:05.020816514 -0800
@@ -39,6 +39,11 @@
gosu --version; \
gosu nobody true
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends libc6-i386; \
+ rm -rf /var/lib/apt/lists/*
+
ENV REDIS_VERSION placeholder
ENV REDIS_DOWNLOAD_URL placeholder
ENV REDIS_DOWNLOAD_SHA placeholder
@@ -52,7 +57,8 @@
wget \
\
gcc \
- libc6-dev \
+ gcc-multilib \
+ libc6-dev-i386 \
make \
; \
rm -rf /var/lib/apt/lists/*; \
@@ -75,7 +81,7 @@
# see also https://github.com/docker-library/redis/issues/4#issuecomment-50780840
# (more exactly, this makes sure the default behavior of "save on SIGTERM" stays functional by default)
\
- make -C /usr/src/redis -j "$(nproc)"; \
+ make -C /usr/src/redis -j "$(nproc)" 32bit; \
make -C /usr/src/redis install; \
\
# TODO https://github.com/antirez/redis/pull/3494 (deduplicate "redis-server" copies) |
yosifkit
approved these changes
Dec 28, 2019
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Dec 30, 2019
Changes: - redis/docker-library-redis@1e3c60f: Merge pull request redis/docker-library-redis#216 from infosiftr/templates - redis/docker-library-redis@d875ae0: Add initial templating
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Jan 1, 2020
Changes: - redis/docker-library-redis@0ed98d3: Merge pull request redis/docker-library-redis#218 from infosiftr/tls - redis/docker-library-redis@b6d413c: Add TLS support in 6.0+ and unify templates slightly more - redis/docker-library-redis@1e3c60f: Merge pull request redis/docker-library-redis#216 from infosiftr/templates - redis/docker-library-redis@d875ae0: Add initial templating
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Jan 2, 2020
Changes: - redis/docker-library-redis@3fe75d3: Merge pull request redis/docker-library-redis#219 from infosiftr/32bit - redis/docker-library-redis@5e15797: Remove 32bit variants for 6.0+ - redis/docker-library-redis@0ed98d3: Merge pull request redis/docker-library-redis#218 from infosiftr/tls - redis/docker-library-redis@b6d413c: Add TLS support in 6.0+ and unify templates slightly more - redis/docker-library-redis@1e3c60f: Merge pull request redis/docker-library-redis#216 from infosiftr/templates - redis/docker-library-redis@d875ae0: Add initial templating
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
The only wrinkle was the protected-mode changes for 6.0+, but I handled them similar to what we do in PHP for multiple variants off the same template.
cc @J0WI
Closes #214