Update docker-library images #3099
Merged
Conversation
This file contains 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
- `julia`: 0.6.0 - `rabbitmq`: adjust `erlang-base-hipe` install for multiarch and exclude Debian+`ppc64le` for now (docker-library/rabbitmq#170) - `redis`: minor comment adjustment (typo fix)
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index c236cbd..e71f78a 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -4,13 +4,11 @@ rabbitmq:latest @ amd64
rabbitmq:latest @ arm32v7
rabbitmq:latest @ arm64v8
rabbitmq:latest @ i386
-rabbitmq:latest @ ppc64le
rabbitmq:latest @ s390x
rabbitmq:management @ amd64
rabbitmq:management @ arm32v7
rabbitmq:management @ arm64v8
rabbitmq:management @ i386
-rabbitmq:management @ ppc64le
rabbitmq:management @ s390x
rabbitmq:management-alpine @ amd64
redis:3.0 @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index d124a61..d4ca148 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,6 @@
julia:0
-julia:0.5
-julia:0.5.2
+julia:0.6
+julia:0.6.0
julia:latest
rabbitmq:3
rabbitmq:3-alpine
diff --git a/julia_latest/Dockerfile b/julia_latest/Dockerfile
index 888e9da..238ef81 100644
--- a/julia_latest/Dockerfile
+++ b/julia_latest/Dockerfile
@@ -5,7 +5,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*
ENV JULIA_PATH /usr/local/julia
-ENV JULIA_VERSION 0.5.2
+ENV JULIA_VERSION 0.6.0
RUN mkdir $JULIA_PATH \
&& apt-get update && apt-get install -y curl \
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_latest/Dockerfile
index a4ceffc..687ae86 100644
--- a/rabbitmq_latest/Dockerfile
+++ b/rabbitmq_latest/Dockerfile
@@ -26,10 +26,18 @@ RUN set -x \
&& apt-get purge -y --auto-remove ca-certificates wget
# install Erlang
-RUN apt-get update \
- && apt-get install -y --no-install-recommends \
+RUN set -ex; \
+ apt-get update; \
+# "erlang-base-hipe" is optional (and only supported on a few arches)
+# so, only install it if it's available for our current arch
+ if apt-cache show erlang-base-hipe 2>/dev/null | grep -q 'Package: erlang-base-hipe'; then \
+ apt-get install -y --no-install-recommends \
+ erlang-base-hipe \
+ ; \
+ fi; \
+# we start with "erlang-base-hipe" because it and "erlang-base" (non-hipe) are exclusive
+ apt-get install -y --no-install-recommends \
erlang-asn1 \
- erlang-base-hipe \
erlang-crypto \
erlang-eldap \
erlang-inets \
@@ -39,7 +47,8 @@ RUN apt-get update \
erlang-public-key \
erlang-ssl \
erlang-xmerl \
- && rm -rf /var/lib/apt/lists/*
+ ; \
+ rm -rf /var/lib/apt/lists/*
# get logs to stdout (thanks @dumbbell for pushing this upstream! :D)
ENV RABBITMQ_LOGS=- RABBITMQ_SASL_LOGS=-
diff --git a/redis_32bit/Dockerfile b/redis_32bit/Dockerfile
index 1c53f04..31591bf 100644
--- a/redis_32bit/Dockerfile
+++ b/redis_32bit/Dockerfile
@@ -54,10 +54,9 @@ RUN set -ex; \
tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \
rm redis.tar.gz; \
\
-# Disable Redis protected mode [1] as it is unnecessary in context
-# of Docker. Ports are not automatically exposed when running inside
-# Docker, but rather explicitely by specifying -p / -P.
-# [1] https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
+# disable Redis protected mode [1] as it is unnecessary in context of Docker
+# (ports are not automatically exposed when running inside Docker, but rather explicitly by specifying -p / -P)
+# [1]: https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 1$' /usr/src/redis/src/server.h; \
sed -ri 's!^(#define CONFIG_DEFAULT_PROTECTED_MODE) 1$!\1 0!' /usr/src/redis/src/server.h; \
grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 0$' /usr/src/redis/src/server.h; \
diff --git a/redis_alpine/Dockerfile b/redis_alpine/Dockerfile
index 33e7b58..678d5c0 100644
--- a/redis_alpine/Dockerfile
+++ b/redis_alpine/Dockerfile
@@ -27,10 +27,9 @@ RUN set -ex; \
tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \
rm redis.tar.gz; \
\
-# Disable Redis protected mode [1] as it is unnecessary in context
-# of Docker. Ports are not automatically exposed when running inside
-# Docker, but rather explicitely by specifying -p / -P.
-# [1] https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
+# disable Redis protected mode [1] as it is unnecessary in context of Docker
+# (ports are not automatically exposed when running inside Docker, but rather explicitly by specifying -p / -P)
+# [1]: https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 1$' /usr/src/redis/src/server.h; \
sed -ri 's!^(#define CONFIG_DEFAULT_PROTECTED_MODE) 1$!\1 0!' /usr/src/redis/src/server.h; \
grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 0$' /usr/src/redis/src/server.h; \
diff --git a/redis_latest/Dockerfile b/redis_latest/Dockerfile
index 1c031d5..eb855c9 100644
--- a/redis_latest/Dockerfile
+++ b/redis_latest/Dockerfile
@@ -49,10 +49,9 @@ RUN set -ex; \
tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \
rm redis.tar.gz; \
\
-# Disable Redis protected mode [1] as it is unnecessary in context
-# of Docker. Ports are not automatically exposed when running inside
-# Docker, but rather explicitely by specifying -p / -P.
-# [1] https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
+# disable Redis protected mode [1] as it is unnecessary in context of Docker
+# (ports are not automatically exposed when running inside Docker, but rather explicitly by specifying -p / -P)
+# [1]: https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 1$' /usr/src/redis/src/server.h; \
sed -ri 's!^(#define CONFIG_DEFAULT_PROTECTED_MODE) 1$!\1 0!' /usr/src/redis/src/server.h; \
grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 0$' /usr/src/redis/src/server.h; \ |
|
Build test of #3099; 77540e0 ( $ bashbrew build julia:0.6.0
Building bashbrew/cache:b8023bcb246ab726c6d11c34d699c7c860739e5639a858aa6b313c32609e5b59 (julia:0.6.0)
Tagging julia:0.6.0
Tagging julia:0.6
Tagging julia:0
Tagging julia:latest
$ test/run.sh julia:0.6.0
testing julia:0.6.0
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'julia-hello-world' [5/5]... % Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
100 220 100 220 0 0 1453 0 --:--:-- --:--:-- --:--:-- 1456
100 11233 0 11233 0 0 34858 0 --:--:-- --:--:-- --:--:-- 114k
INFO: Initializing package repository /root/.julia/v0.6
INFO: Cloning METADATA from https://github.com/JuliaLang/METADATA.jl
INFO: Cloning cache of Compat from https://github.com/JuliaLang/Compat.jl.git
INFO: Cloning cache of JSON from https://github.com/JuliaIO/JSON.jl.git
INFO: Installing Compat v0.26.0
INFO: Installing JSON v0.12.0
INFO: Package database updated
passed
$ bashbrew build rabbitmq:3.6.10
Building bashbrew/cache:4485a451c44a5e1070eec4554f8a1d493d9a8c10196109ea161b7a75e70db6df (rabbitmq:3.6.10)
Tagging rabbitmq:3.6.10
Tagging rabbitmq:3.6
Tagging rabbitmq:3
Tagging rabbitmq:latest
$ test/run.sh rabbitmq:3.6.10
testing rabbitmq:3.6.10
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build rabbitmq:3.6.10-management
Building bashbrew/cache:31c9ed1993c45f6702f30ff8e4888c5a6f2db9165cd2371d342b43587bb40e6c (rabbitmq:3.6.10-management)
Tagging rabbitmq:3.6.10-management
Tagging rabbitmq:3.6-management
Tagging rabbitmq:3-management
Tagging rabbitmq:management
$ test/run.sh rabbitmq:3.6.10-management
testing rabbitmq:3.6.10-management
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build rabbitmq:3.6.10-alpine
Using bashbrew/cache:096a06177520112122ffa5986bfc8982f40fc0040ffcf6bb8578352a772ab3a2 (rabbitmq:3.6.10-alpine)
Tagging rabbitmq:3.6.10-alpine
Tagging rabbitmq:3.6-alpine
Tagging rabbitmq:3-alpine
Tagging rabbitmq:alpine
$ test/run.sh rabbitmq:3.6.10-alpine
testing rabbitmq:3.6.10-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build rabbitmq:3.6.10-management-alpine
Using bashbrew/cache:f03472a3770a51397b892067e84ee6aba48c4fc199a32d2b709f136a12dba9f1 (rabbitmq:3.6.10-management-alpine)
Tagging rabbitmq:3.6.10-management-alpine
Tagging rabbitmq:3.6-management-alpine
Tagging rabbitmq:3-management-alpine
Tagging rabbitmq:management-alpine
$ test/run.sh rabbitmq:3.6.10-management-alpine
testing rabbitmq:3.6.10-management-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build redis:3.0.7
Using bashbrew/cache:3c9875d4ee29b69681b3162f2fdb4e2ab7501ef8b300b03936ccb43156ff3ef8 (redis:3.0.7)
Tagging redis:3.0.7
Tagging redis:3.0
$ test/run.sh redis:3.0.7
testing redis:3.0.7
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'redis-basics' [5/7]...passed
'redis-basics-config' [6/7]...passed
'redis-basics-persistent' [7/7]...passed
$ bashbrew build redis:3.0.7-32bit
Using bashbrew/cache:c8cdeacfa47b64cea4761e8bb1b8be16ad17123f50692c0356f326cdc271ca7c (redis:3.0.7-32bit)
Tagging redis:3.0.7-32bit
Tagging redis:3.0-32bit
$ test/run.sh redis:3.0.7-32bit
testing redis:3.0.7-32bit
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'redis-basics' [5/7]...passed
'redis-basics-config' [6/7]...passed
'redis-basics-persistent' [7/7]...passed
$ bashbrew build redis:3.0.7-alpine
Building bashbrew/cache:bb3129c6fef3e780bf99cbf82e7096136a55360c056f0e90cdc31fbaecb8d92c (redis:3.0.7-alpine)
Tagging redis:3.0.7-alpine
Tagging redis:3.0-alpine
$ test/run.sh redis:3.0.7-alpine
testing redis:3.0.7-alpine
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'redis-basics' [5/7]...passed
'redis-basics-config' [6/7]...passed
'redis-basics-persistent' [7/7]...passed
$ bashbrew build redis:3.0.504-windowsservercore
skipping "redis:3.0.504-windowsservercore" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh redis:3.0.504-windowsservercore
testing redis:3.0.504-windowsservercore
image does not exist!
$ bashbrew build redis:3.0.504-nanoserver
skipping "redis:3.0.504-nanoserver" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh redis:3.0.504-nanoserver
testing redis:3.0.504-nanoserver
image does not exist!
$ bashbrew build redis:3.2.9
Building bashbrew/cache:850aeaaf446bd1c6b71b31f85a200d840302cb450a33f917a0df56f1e1c6f264 (redis:3.2.9)
Tagging redis:3.2.9
Tagging redis:3.2
Tagging redis:3
Tagging redis:latest
$ test/run.sh redis:3.2.9
testing redis:3.2.9
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'redis-basics' [5/7]...passed
'redis-basics-config' [6/7]...passed
'redis-basics-persistent' [7/7]...passed
$ bashbrew build redis:3.2.9-32bit
Building bashbrew/cache:1cf7d9f60e7158d91e68477a9a279be8e961f0496e036aaf8bcf1b64784cb309 (redis:3.2.9-32bit)
Tagging redis:3.2.9-32bit
Tagging redis:3.2-32bit
Tagging redis:3-32bit
Tagging redis:32bit
$ test/run.sh redis:3.2.9-32bit
testing redis:3.2.9-32bit
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'redis-basics' [5/7]...passed
'redis-basics-config' [6/7]...passed
'redis-basics-persistent' [7/7]...passed
$ bashbrew build redis:3.2.9-alpine
Building bashbrew/cache:ce4aab785ae0d5421cdcffa7d41c5a265d4ced12bde9c5fc9c6f441288325d6f (redis:3.2.9-alpine)
Tagging redis:3.2.9-alpine
Tagging redis:3.2-alpine
Tagging redis:3-alpine
Tagging redis:alpine
$ test/run.sh redis:3.2.9-alpine
testing redis:3.2.9-alpine
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'redis-basics' [5/7]...passed
'redis-basics-config' [6/7]...passed
'redis-basics-persistent' [7/7]...passed
$ bashbrew build redis:3.2.100-windowsservercore
skipping "redis:3.2.100-windowsservercore" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh redis:3.2.100-windowsservercore
testing redis:3.2.100-windowsservercore
image does not exist!
$ bashbrew build redis:3.2.100-nanoserver
skipping "redis:3.2.100-nanoserver" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh redis:3.2.100-nanoserver
testing redis:3.2.100-nanoserver
image does not exist!
The following images failed at least one test:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
julia: 0.6.0rabbitmq: adjusterlang-base-hipeinstall for multiarch and exclude Debian+ppc64lefor now (Adjust "erlang-base-hipe" installation to only happen if the package is available rabbitmq#170)redis: minor comment adjustment (typo fix)