Skip to content
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.

Sign up for GitHub

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

stop support 17, update base os version to stretch #175

Merged
merged 2 commits into from
Nov 16, 2018
Merged

stop support 17, update base os version to stretch #175

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba81527
stop support 17, delete 21/jessie version, update base os version to …
getong Nov 6, 2018
06d4d38
erlang/otp 18.3.4.11
getong Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
stop support 17, delete 21/jessie version, update base os version to … 
…stretch
  • Loading branch information
@getong
getong committed Nov 9, 2018
commit ba81527544daf50d27a85b1a6001cc541b742089
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ env:
- DIR=21
- DIR=21 VARIANT=slim
- DIR=21 VARIANT=alpine
- DIR=21 VARIANT=jessie
- DIR=20
- DIR=20 VARIANT=slim
- DIR=20 VARIANT=alpine
Expand Down
9 changes: 6 additions & 3 deletions 18/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM buildpack-deps:jessie
FROM buildpack-deps:stretch

ENV OTP_VERSION="18.3.4.10"

Expand All @@ -8,9 +8,12 @@ RUN set -xe \
&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
&& OTP_DOWNLOAD_SHA256="994c8aa2931d4d7ad473c68d1be31ec9e7faa96a2859f253225c3b33226dfcba" \
&& runtimeDeps='libodbc1 \
libsctp1' \
libsctp1 \
libssl1.0-dev \
libwxgtk3.0' \
&& buildDeps='unixodbc-dev \
libsctp-dev' \
libsctp-dev \
libwxgtk3.0-dev' \
&& apt-get update \
&& apt-get install -y --no-install-recommends $runtimeDeps \
&& apt-get install -y --no-install-recommends $buildDeps \
Expand Down
4 changes: 2 additions & 2 deletions 18/slim/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:jessie
FROM debian:stretch

ENV OTP_VERSION="18.3.4.10"

Expand All @@ -16,7 +16,7 @@ RUN set -xe \
&& echo "$OTP_DOWNLOAD_SHA256 otp-src.tar.gz" | sha256sum -c - \
&& runtimeDeps=' \
libodbc1 \
libssl1.0.0 \
libssl1.0.2 \
libsctp1 \
' \
&& buildDeps=' \
Expand Down
3 changes: 2 additions & 1 deletion 19/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM buildpack-deps:jessie
FROM buildpack-deps:stretch

ENV OTP_VERSION="19.3.6.12"

Expand All @@ -9,6 +9,7 @@ RUN set -xe \
&& OTP_DOWNLOAD_SHA256="f5ff65cde3f2db6f1dd61f6985136fcf87b55fa3f85e17ee513cc05dbe2da635" \
&& runtimeDeps='libodbc1 \
libsctp1 \
libssl1.0-dev \
libwxgtk3.0' \
&& buildDeps='unixodbc-dev \
libsctp-dev \
Expand Down
6 changes: 3 additions & 3 deletions 19/slim/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:jessie
FROM debian:stretch

ENV OTP_VERSION="19.3.6.12"

Expand All @@ -9,7 +9,7 @@ RUN set -xe \
&& OTP_DOWNLOAD_SHA256="f5ff65cde3f2db6f1dd61f6985136fcf87b55fa3f85e17ee513cc05dbe2da635" \
&& runtimeDeps=' \
libodbc1 \
libssl1.0.0 \
libssl1.0.2 \
libsctp1 \
libwxgtk3.0 \
' \
Expand All @@ -19,12 +19,12 @@ RUN set -xe \
autoconf \
dpkg-dev \
gcc \
g++ \
make \
libncurses-dev \
unixodbc-dev \
libssl-dev \
libsctp-dev \
libwxgtk3.0-dev \
' \
&& apt-get update \
&& apt-get install -y --no-install-recommends $runtimeDeps \
Expand Down
67 changes: 0 additions & 67 deletions 21/jessie/Dockerfile
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions generate-stackbrew-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -eu

declare -a -r versions=( 21 20 19 18 17 )
declare -a -r versions=( 21 20 19 18 )
declare -A -r aliases=(
[21]='latest'
)
Expand Down Expand Up @@ -71,7 +71,7 @@ for version in "${versions[@]}"; do
done
versionAliases+=( $version ${aliases[$version]:-} )

for variant in '' slim alpine jessie; do
for variant in '' slim alpine; do
dir="$version${variant:+/$variant}"
[ -f "$dir/Dockerfile" ] || continue

Expand All @@ -90,9 +90,6 @@ for version in "${versions[@]}"; do
case "$version" in
19|18) variantArches=( ${variantArches[@]/ppc64le} )
esac
case "$variant" in
jessie) variantArches=( amd64 )
esac

echo
cat <<-EOE
Expand Down