Skip to content

Commit c718c72

Browse files
committed
Replace "stretch" with "buster" for Ruby 2.7-rc given the imminent Debian release
(and ditch Alpine 3.9 in 2.7-rc)
1 parent 195d5bc commit c718c72

File tree

6 files changed

+14
-129
lines changed

6 files changed

+14
-129
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ language: bash
22
services: docker
33

44
env:
5-
- VERSION=2.7-rc VARIANT=stretch
6-
- VERSION=2.7-rc VARIANT=stretch/slim
5+
- VERSION=2.7-rc VARIANT=buster
6+
- VERSION=2.7-rc VARIANT=buster/slim
77
- VERSION=2.7-rc VARIANT=alpine3.10
8-
- VERSION=2.7-rc VARIANT=alpine3.9
98
- VERSION=2.6 VARIANT=stretch
109
- VERSION=2.6 VARIANT=stretch/slim
1110
- VERSION=2.6 VARIANT=alpine3.10

2.7-rc/alpine3.9/Dockerfile

Lines changed: 0 additions & 118 deletions
This file was deleted.

2.7-rc/stretch/Dockerfile renamed to 2.7-rc/buster/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM buildpack-deps:stretch
1+
FROM buildpack-deps:buster
22

33
# skip installing gem documentation
44
RUN mkdir -p /usr/local/etc \

2.7-rc/stretch/slim/Dockerfile renamed to 2.7-rc/buster/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:stretch-slim
1+
FROM debian:buster-slim
22

33
RUN apt-get update \
44
&& apt-get install -y --no-install-recommends \

generate-stackbrew-library.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ declare -A aliases=(
66
[2.7-rc]='rc'
77
)
88

9-
defaultDebianSuite='stretch'
9+
defaultDebianSuite='stretch' # TODO buster
10+
declare -A debianSuites=(
11+
[2.7-rc]='buster'
12+
)
1013
defaultAlpineVersion='3.10'
1114
declare -A alpineVersion=(
1215
#[2.3]='3.8'
@@ -76,7 +79,7 @@ join() {
7679

7780
for version in "${versions[@]}"; do
7881
for v in \
79-
{stretch,jessie}{,/slim} \
82+
{buster,stretch,jessie}{,/slim} \
8083
alpine{3.10,3.9} \
8184
; do
8285
dir="$version/$v"
@@ -101,12 +104,13 @@ for version in "${versions[@]}"; do
101104
)
102105

103106
variantAliases=( "${versionAliases[@]/%/-$variant}" )
107+
debianSuite="${debianSuites[$version]:-$defaultDebianSuite}"
104108
case "$variant" in
105-
"$defaultDebianSuite")
109+
"$debianSuite")
106110
variantAliases+=( "${versionAliases[@]}" )
107111
;;
108-
*-"$defaultDebianSuite")
109-
variantAliases+=( "${versionAliases[@]/%/-${variant%-$defaultDebianSuite}}" )
112+
*-"$debianSuite")
113+
variantAliases+=( "${versionAliases[@]/%/-${variant%-$debianSuite}}" )
110114
;;
111115
"alpine${alpineVersion[$version]:-$defaultAlpineVersion}")
112116
variantAliases+=( "${versionAliases[@]/%/-alpine}" )

update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ for version in "${versions[@]}"; do
7272

7373
for v in \
7474
alpine{3.9,3.10} \
75-
{jessie,stretch}{/slim,} \
75+
{jessie,stretch,buster}{/slim,} \
7676
; do
7777
dir="$version/$v"
7878
variant="$(basename "$v")"

0 commit comments

Comments
 (0)