-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
fix erlang 18, 19 slim crypto not found problem #5094
Merged
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
getong
force-pushed
the
fix-erlang-18-19-slim
branch
from
November 22, 2018 08:05
da6877c
to
717eeae
Compare
Diff:diff --git a/_bashbrew-list b/_bashbrew-list
index 11e7973..ab1bfed 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -32,9 +32,9 @@ erlang:21-slim
erlang:21.1
erlang:21.1-alpine
erlang:21.1-slim
-erlang:21.1.2
-erlang:21.1.2-alpine
-erlang:21.1.2-slim
+erlang:21.1.3
+erlang:21.1.3-alpine
+erlang:21.1.3-slim
erlang:alpine
erlang:latest
erlang:slim
diff --git a/erlang_18-slim/Dockerfile b/erlang_18-slim/Dockerfile
index 7ea1c4c..3dfdf3a 100644
--- a/erlang_18-slim/Dockerfile
+++ b/erlang_18-slim/Dockerfile
@@ -27,7 +27,7 @@ RUN set -xe \
make \
libncurses-dev \
unixodbc-dev \
- libssl-dev \
+ libssl1.0-dev \
libsctp-dev \
' \
&& apt-get install -y --no-install-recommends $runtimeDeps \
diff --git a/erlang_18/Dockerfile b/erlang_18/Dockerfile
index f0cc1e2..35a778a 100644
--- a/erlang_18/Dockerfile
+++ b/erlang_18/Dockerfile
@@ -52,11 +52,11 @@ RUN set -xe \
&& install -v ./rebar /usr/local/bin/ \
&& rm -rf /usr/src/rebar-src
-ENV REBAR3_VERSION="3.6.1"
+ENV REBAR3_VERSION="3.7.4"
RUN set -xe \
&& REBAR3_DOWNLOAD_URL="https://github.com/erlang/rebar3/archive/${REBAR3_VERSION}.tar.gz" \
- && REBAR3_DOWNLOAD_SHA256="40b3c85440f3235c7b149578d0211bdf57d1c66390f888bb771704f8abc71033" \
+ && REBAR3_DOWNLOAD_SHA256="3747ef351999caec65304839ecd9324ac8eec8c38210fb43dc598e3caed0a2c0" \
&& mkdir -p /usr/src/rebar3-src \
&& curl -fSL -o rebar3-src.tar.gz "$REBAR3_DOWNLOAD_URL" \
&& echo "$REBAR3_DOWNLOAD_SHA256 rebar3-src.tar.gz" | sha256sum -c - \
diff --git a/erlang_19-slim/Dockerfile b/erlang_19-slim/Dockerfile
index 2a3d181..375d58e 100644
--- a/erlang_19-slim/Dockerfile
+++ b/erlang_19-slim/Dockerfile
@@ -23,7 +23,7 @@ RUN set -xe \
make \
libncurses-dev \
unixodbc-dev \
- libssl-dev \
+ libssl1.0-dev \
libsctp-dev \
' \
&& apt-get update \
diff --git a/erlang_19/Dockerfile b/erlang_19/Dockerfile
index a6459e9..1ed1e70 100644
--- a/erlang_19/Dockerfile
+++ b/erlang_19/Dockerfile
@@ -52,11 +52,11 @@ RUN set -xe \
&& install -v ./rebar /usr/local/bin/ \
&& rm -rf /usr/src/rebar-src
-ENV REBAR3_VERSION="3.6.1"
+ENV REBAR3_VERSION="3.7.4"
RUN set -xe \
&& REBAR3_DOWNLOAD_URL="https://github.com/erlang/rebar3/archive/${REBAR3_VERSION}.tar.gz" \
- && REBAR3_DOWNLOAD_SHA256="40b3c85440f3235c7b149578d0211bdf57d1c66390f888bb771704f8abc71033" \
+ && REBAR3_DOWNLOAD_SHA256="3747ef351999caec65304839ecd9324ac8eec8c38210fb43dc598e3caed0a2c0" \
&& mkdir -p /usr/src/rebar3-src \
&& curl -fSL -o rebar3-src.tar.gz "$REBAR3_DOWNLOAD_URL" \
&& echo "$REBAR3_DOWNLOAD_SHA256 rebar3-src.tar.gz" | sha256sum -c - \
diff --git a/erlang_20-alpine/Dockerfile b/erlang_20-alpine/Dockerfile
index dcfeb75..f10e167 100644
--- a/erlang_20-alpine/Dockerfile
+++ b/erlang_20-alpine/Dockerfile
@@ -1,12 +1,12 @@
FROM alpine:3.8
ENV OTP_VERSION="20.3.8.14"
-ENV REBAR3_VERSION="3.6.1"
+ENV REBAR3_VERSION="3.7.4"
RUN set -xe \
&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
&& OTP_DOWNLOAD_SHA256="a89f5558b296988a689013105294b1e3a968a01918be2552b5766d896169a616" \
- && REBAR3_DOWNLOAD_SHA256="40b3c85440f3235c7b149578d0211bdf57d1c66390f888bb771704f8abc71033" \
+ && REBAR3_DOWNLOAD_SHA256="3747ef351999caec65304839ecd9324ac8eec8c38210fb43dc598e3caed0a2c0" \
&& apk add --no-cache --virtual .fetch-deps \
curl \
ca-certificates \
diff --git a/erlang_20/Dockerfile b/erlang_20/Dockerfile
index 5a6559c..6f63e9d 100644
--- a/erlang_20/Dockerfile
+++ b/erlang_20/Dockerfile
@@ -51,11 +51,11 @@ RUN set -xe \
&& install -v ./rebar /usr/local/bin/ \
&& rm -rf /usr/src/rebar-src
-ENV REBAR3_VERSION="3.6.1"
+ENV REBAR3_VERSION="3.7.4"
RUN set -xe \
&& REBAR3_DOWNLOAD_URL="https://github.com/erlang/rebar3/archive/${REBAR3_VERSION}.tar.gz" \
- && REBAR3_DOWNLOAD_SHA256="40b3c85440f3235c7b149578d0211bdf57d1c66390f888bb771704f8abc71033" \
+ && REBAR3_DOWNLOAD_SHA256="3747ef351999caec65304839ecd9324ac8eec8c38210fb43dc598e3caed0a2c0" \
&& mkdir -p /usr/src/rebar3-src \
&& curl -fSL -o rebar3-src.tar.gz "$REBAR3_DOWNLOAD_URL" \
&& echo "$REBAR3_DOWNLOAD_SHA256 rebar3-src.tar.gz" | sha256sum -c - \
diff --git a/erlang_alpine/Dockerfile b/erlang_alpine/Dockerfile
index 29aa239..63a5914 100644
--- a/erlang_alpine/Dockerfile
+++ b/erlang_alpine/Dockerfile
@@ -1,12 +1,12 @@
FROM alpine:3.8
-ENV OTP_VERSION="21.1.2"
-ENV REBAR3_VERSION="3.6.1"
+ENV OTP_VERSION="21.1.3"
+ENV REBAR3_VERSION="3.7.4"
RUN set -xe \
&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
- && OTP_DOWNLOAD_SHA256="3e3c893a4c025538c3508838b2f2f08842202449d161b755de7df08938e1e0d0" \
- && REBAR3_DOWNLOAD_SHA256="40b3c85440f3235c7b149578d0211bdf57d1c66390f888bb771704f8abc71033"\
+ && OTP_DOWNLOAD_SHA256="9a447e1debed355ff78f5d502dc8259139d5aed2362037e7cca9dc9919245eca" \
+ && REBAR3_DOWNLOAD_SHA256="3747ef351999caec65304839ecd9324ac8eec8c38210fb43dc598e3caed0a2c0"\
&& apk add --no-cache --virtual .fetch-deps \
curl \
ca-certificates \
diff --git a/erlang_latest/Dockerfile b/erlang_latest/Dockerfile
index abc7836..e527902 100644
--- a/erlang_latest/Dockerfile
+++ b/erlang_latest/Dockerfile
@@ -1,12 +1,12 @@
FROM buildpack-deps:stretch
-ENV OTP_VERSION="21.1.2"
+ENV OTP_VERSION="21.1.3"
# We'll install the build dependencies for erlang-odbc along with the erlang
# build process:
RUN set -xe \
&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
- && OTP_DOWNLOAD_SHA256="3e3c893a4c025538c3508838b2f2f08842202449d161b755de7df08938e1e0d0" \
+ && OTP_DOWNLOAD_SHA256="9a447e1debed355ff78f5d502dc8259139d5aed2362037e7cca9dc9919245eca" \
&& runtimeDeps='libodbc1 \
libsctp1 \
libwxgtk3.0' \
@@ -51,11 +51,11 @@ RUN set -xe \
&& install -v ./rebar /usr/local/bin/ \
&& rm -rf /usr/src/rebar-src
-ENV REBAR3_VERSION="3.6.1"
+ENV REBAR3_VERSION="3.7.4"
RUN set -xe \
&& REBAR3_DOWNLOAD_URL="https://github.com/erlang/rebar3/archive/${REBAR3_VERSION}.tar.gz" \
- && REBAR3_DOWNLOAD_SHA256="40b3c85440f3235c7b149578d0211bdf57d1c66390f888bb771704f8abc71033" \
+ && REBAR3_DOWNLOAD_SHA256="3747ef351999caec65304839ecd9324ac8eec8c38210fb43dc598e3caed0a2c0" \
&& mkdir -p /usr/src/rebar3-src \
&& curl -fSL -o rebar3-src.tar.gz "$REBAR3_DOWNLOAD_URL" \
&& echo "$REBAR3_DOWNLOAD_SHA256 rebar3-src.tar.gz" | sha256sum -c - \
diff --git a/erlang_slim/Dockerfile b/erlang_slim/Dockerfile
index 92a461d..cdb1be1 100644
--- a/erlang_slim/Dockerfile
+++ b/erlang_slim/Dockerfile
@@ -1,12 +1,12 @@
FROM debian:stretch
-ENV OTP_VERSION="21.1.2"
+ENV OTP_VERSION="21.1.3"
# We'll install the build dependencies, and purge them on the last step to make
# sure our final image contains only what we've just built:
RUN set -xe \
&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
- && OTP_DOWNLOAD_SHA256="3e3c893a4c025538c3508838b2f2f08842202449d161b755de7df08938e1e0d0" \
+ && OTP_DOWNLOAD_SHA256="9a447e1debed355ff78f5d502dc8259139d5aed2362037e7cca9dc9919245eca" \
&& fetchDeps=' \
curl \
ca-certificates' \ |
LGTM Build test of #5094; 298e4f8; $ bashbrew build erlang:21.1.3
Building bashbrew/cache:d06db82a82021a1dd015bee7b8ecf5d6110a5c393ba2e9b18330d5507d3256ad (erlang:21.1.3)
Tagging erlang:21.1.3
Tagging erlang:21.1
Tagging erlang:21
Tagging erlang:latest
$ test/run.sh erlang:21.1.3
testing erlang:21.1.3
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'erlang-hello-world' [5/5]...passed
$ bashbrew build erlang:21.1.3-slim
Building bashbrew/cache:2765c158d321fecf488e56701df37f72c4f02390f682f8ba736e9ccf8a1ed159 (erlang:21.1.3-slim)
Tagging erlang:21.1.3-slim
Tagging erlang:21.1-slim
Tagging erlang:21-slim
Tagging erlang:slim
$ test/run.sh erlang:21.1.3-slim
testing erlang:21.1.3-slim
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'erlang-hello-world' [5/5]...passed
$ bashbrew build erlang:21.1.3-alpine
Building bashbrew/cache:95100e179f9e0da5017c79aeeffb5ad333445a8ffb63d5be38118b971b4e4493 (erlang:21.1.3-alpine)
Tagging erlang:21.1.3-alpine
Tagging erlang:21.1-alpine
Tagging erlang:21-alpine
Tagging erlang:alpine
$ test/run.sh erlang:21.1.3-alpine
testing erlang:21.1.3-alpine
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'erlang-hello-world' [5/5]...passed
$ bashbrew build erlang:20.3.8.14
Building bashbrew/cache:e0b2253783dac025fe21b310cdf26ac48007287c08a10ae0b88bbc1258d77015 (erlang:20.3.8.14)
Tagging erlang:20.3.8.14
Tagging erlang:20.3.8
Tagging erlang:20.3
Tagging erlang:20
$ test/run.sh erlang:20.3.8.14
testing erlang:20.3.8.14
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'erlang-hello-world' [5/5]...passed
$ bashbrew build erlang:20.3.8.14-slim
Using bashbrew/cache:dc005102d0312a8831f644fa880b0a55e92a4fbc22eff4945ea494464f1fe0b4 (erlang:20.3.8.14-slim)
Tagging erlang:20.3.8.14-slim
Tagging erlang:20.3.8-slim
Tagging erlang:20.3-slim
Tagging erlang:20-slim
$ test/run.sh erlang:20.3.8.14-slim
testing erlang:20.3.8.14-slim
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'erlang-hello-world' [5/5]...passed
$ bashbrew build erlang:20.3.8.14-alpine
Building bashbrew/cache:9e63e8b518315decb3579e81ba187ff0302f7d1854f8bb72d362bff37e8283cb (erlang:20.3.8.14-alpine)
Tagging erlang:20.3.8.14-alpine
Tagging erlang:20.3.8-alpine
Tagging erlang:20.3-alpine
Tagging erlang:20-alpine
$ test/run.sh erlang:20.3.8.14-alpine
testing erlang:20.3.8.14-alpine
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'erlang-hello-world' [5/5]...passed
$ bashbrew build erlang:19.3.6.12
Building bashbrew/cache:e85b016de120abb46858aa07c39ee2d66b57ac74075c52bd4e5f84de5ae21c43 (erlang:19.3.6.12)
Tagging erlang:19.3.6.12
Tagging erlang:19.3.6
Tagging erlang:19.3
Tagging erlang:19
$ test/run.sh erlang:19.3.6.12
testing erlang:19.3.6.12
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'erlang-hello-world' [5/5]...passed
$ bashbrew build erlang:19.3.6.12-slim
Building bashbrew/cache:a31acd3bbb3bb9300e2f406bc4b9b21e30a930a854fb35f500aacc5852f02987 (erlang:19.3.6.12-slim)
Tagging erlang:19.3.6.12-slim
Tagging erlang:19.3.6-slim
Tagging erlang:19.3-slim
Tagging erlang:19-slim
$ test/run.sh erlang:19.3.6.12-slim
testing erlang:19.3.6.12-slim
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'erlang-hello-world' [5/5]...passed
$ bashbrew build erlang:18.3.4.11
Building bashbrew/cache:d0d03d645e5a51c975ba01c8b5d5d4a56c6c755e319bd3a2e4ae9345a299a7cc (erlang:18.3.4.11)
Tagging erlang:18.3.4.11
Tagging erlang:18.3.4
Tagging erlang:18.3
Tagging erlang:18
$ test/run.sh erlang:18.3.4.11
testing erlang:18.3.4.11
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'erlang-hello-world' [5/5]...passed
$ bashbrew build erlang:18.3.4.11-slim
Building bashbrew/cache:95e3b4742d706c28800239e297f32bbf49f38f60cb9751e1404f8f560425e96c (erlang:18.3.4.11-slim)
Tagging erlang:18.3.4.11-slim
Tagging erlang:18.3.4-slim
Tagging erlang:18.3-slim
Tagging erlang:18-slim
$ test/run.sh erlang:18.3.4.11-slim
testing erlang:18.3.4.11-slim
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'erlang-hello-world' [5/5]...passed
|
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.
No description provided.