Skip to content

Conversation

@tianon
Copy link
Member

@tianon tianon commented Jun 11, 2020

Changes:

Changes:

- docker-library/ruby@644570a: Merge pull request docker-library/ruby#321 from J0WI/alpine-3.12
- docker-library/ruby@27938af: Add Alpine 3.12
- docker-library/ruby@a6b23d5: Merge pull request docker-library/ruby#317 from docker-library/github-actions
- docker-library/ruby@3bda762: Add initial GitHub Actions CI
@github-actions
Copy link

Diff for 5b31582:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8f569ce..7f15ed8 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,15 +1,15 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/ruby.git
 
-Tags: 2.5.8-alpine3.10, 2.5-alpine3.10
+Tags: 2.5.8-alpine3.11, 2.5-alpine3.11
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a564feaaee4c8647c299ab11d41498468bb9af7b
-Directory: 2.5/alpine3.10
+GitCommit: 27938afac28fcb1fc167ddf6ee15520e88d90259
+Directory: 2.5/alpine3.11
 
-Tags: 2.5.8-alpine3.11, 2.5-alpine3.11, 2.5.8-alpine, 2.5-alpine
+Tags: 2.5.8-alpine3.12, 2.5-alpine3.12, 2.5.8-alpine, 2.5-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a564feaaee4c8647c299ab11d41498468bb9af7b
-Directory: 2.5/alpine3.11
+GitCommit: 27938afac28fcb1fc167ddf6ee15520e88d90259
+Directory: 2.5/alpine3.12
 
 Tags: 2.5.8-buster, 2.5-buster, 2.5.8, 2.5
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -31,15 +31,15 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: a564feaaee4c8647c299ab11d41498468bb9af7b
 Directory: 2.5/stretch
 
-Tags: 2.6.6-alpine3.10, 2.6-alpine3.10
+Tags: 2.6.6-alpine3.11, 2.6-alpine3.11
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a564feaaee4c8647c299ab11d41498468bb9af7b
-Directory: 2.6/alpine3.10
+GitCommit: 27938afac28fcb1fc167ddf6ee15520e88d90259
+Directory: 2.6/alpine3.11
 
-Tags: 2.6.6-alpine3.11, 2.6-alpine3.11, 2.6.6-alpine, 2.6-alpine
+Tags: 2.6.6-alpine3.12, 2.6-alpine3.12, 2.6.6-alpine, 2.6-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a564feaaee4c8647c299ab11d41498468bb9af7b
-Directory: 2.6/alpine3.11
+GitCommit: 27938afac28fcb1fc167ddf6ee15520e88d90259
+Directory: 2.6/alpine3.12
 
 Tags: 2.6.6-buster, 2.6-buster, 2.6.6, 2.6
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -61,15 +61,15 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: a564feaaee4c8647c299ab11d41498468bb9af7b
 Directory: 2.6/stretch
 
-Tags: 2.7.1-alpine3.10, 2.7-alpine3.10, 2-alpine3.10, alpine3.10
+Tags: 2.7.1-alpine3.11, 2.7-alpine3.11, 2-alpine3.11, alpine3.11
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a564feaaee4c8647c299ab11d41498468bb9af7b
-Directory: 2.7/alpine3.10
+GitCommit: 27938afac28fcb1fc167ddf6ee15520e88d90259
+Directory: 2.7/alpine3.11
 
-Tags: 2.7.1-alpine3.11, 2.7-alpine3.11, 2-alpine3.11, alpine3.11, 2.7.1-alpine, 2.7-alpine, 2-alpine, alpine
+Tags: 2.7.1-alpine3.12, 2.7-alpine3.12, 2-alpine3.12, alpine3.12, 2.7.1-alpine, 2.7-alpine, 2-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a564feaaee4c8647c299ab11d41498468bb9af7b
-Directory: 2.7/alpine3.11
+GitCommit: 27938afac28fcb1fc167ddf6ee15520e88d90259
+Directory: 2.7/alpine3.12
 
 Tags: 2.7.1-buster, 2.7-buster, 2-buster, buster, 2.7.1, 2.7, 2, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
diff --git a/_bashbrew-list b/_bashbrew-list
index e11b4f5..a2eaf49 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,14 +1,14 @@
 ruby:2
 ruby:2-alpine
-ruby:2-alpine3.10
 ruby:2-alpine3.11
+ruby:2-alpine3.12
 ruby:2-buster
 ruby:2-slim
 ruby:2-slim-buster
 ruby:2.5
 ruby:2.5-alpine
-ruby:2.5-alpine3.10
 ruby:2.5-alpine3.11
+ruby:2.5-alpine3.12
 ruby:2.5-buster
 ruby:2.5-slim
 ruby:2.5-slim-buster
@@ -16,8 +16,8 @@ ruby:2.5-slim-stretch
 ruby:2.5-stretch
 ruby:2.5.8
 ruby:2.5.8-alpine
-ruby:2.5.8-alpine3.10
 ruby:2.5.8-alpine3.11
+ruby:2.5.8-alpine3.12
 ruby:2.5.8-buster
 ruby:2.5.8-slim
 ruby:2.5.8-slim-buster
@@ -25,8 +25,8 @@ ruby:2.5.8-slim-stretch
 ruby:2.5.8-stretch
 ruby:2.6
 ruby:2.6-alpine
-ruby:2.6-alpine3.10
 ruby:2.6-alpine3.11
+ruby:2.6-alpine3.12
 ruby:2.6-buster
 ruby:2.6-slim
 ruby:2.6-slim-buster
@@ -34,8 +34,8 @@ ruby:2.6-slim-stretch
 ruby:2.6-stretch
 ruby:2.6.6
 ruby:2.6.6-alpine
-ruby:2.6.6-alpine3.10
 ruby:2.6.6-alpine3.11
+ruby:2.6.6-alpine3.12
 ruby:2.6.6-buster
 ruby:2.6.6-slim
 ruby:2.6.6-slim-buster
@@ -43,21 +43,21 @@ ruby:2.6.6-slim-stretch
 ruby:2.6.6-stretch
 ruby:2.7
 ruby:2.7-alpine
-ruby:2.7-alpine3.10
 ruby:2.7-alpine3.11
+ruby:2.7-alpine3.12
 ruby:2.7-buster
 ruby:2.7-slim
 ruby:2.7-slim-buster
 ruby:2.7.1
 ruby:2.7.1-alpine
-ruby:2.7.1-alpine3.10
 ruby:2.7.1-alpine3.11
+ruby:2.7.1-alpine3.12
 ruby:2.7.1-buster
 ruby:2.7.1-slim
 ruby:2.7.1-slim-buster
 ruby:alpine
-ruby:alpine3.10
 ruby:alpine3.11
+ruby:alpine3.12
 ruby:buster
 ruby:latest
 ruby:slim
diff --git a/ruby_2.5-alpine/Dockerfile b/ruby_2.5-alpine/Dockerfile
index 9707bb7..4e72886 100644
--- a/ruby_2.5-alpine/Dockerfile
+++ b/ruby_2.5-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 RUN apk add --no-cache \
 		gmp-dev
@@ -41,6 +41,7 @@ RUN set -eux; \
 		ncurses-dev \
 		openssl \
 		openssl-dev \
+		patch \
 		procps \
 		readline-dev \
 		ruby \
diff --git a/ruby_2.5-alpine3.10/Dockerfile b/ruby_2.5-alpine3.11/Dockerfile
similarity index 99%
rename from ruby_2.5-alpine3.10/Dockerfile
rename to ruby_2.5-alpine3.11/Dockerfile
index 0b50fa1..9c077a2 100644
--- a/ruby_2.5-alpine3.10/Dockerfile
+++ b/ruby_2.5-alpine3.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
 
 RUN apk add --no-cache \
 		gmp-dev
@@ -41,6 +41,7 @@ RUN set -eux; \
 		ncurses-dev \
 		openssl \
 		openssl-dev \
+		patch \
 		procps \
 		readline-dev \
 		ruby \
diff --git a/ruby_2.6-alpine/Dockerfile b/ruby_2.6-alpine/Dockerfile
index 0fa1ca0..f59cd69 100644
--- a/ruby_2.6-alpine/Dockerfile
+++ b/ruby_2.6-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 RUN apk add --no-cache \
 		gmp-dev
@@ -40,6 +40,7 @@ RUN set -eux; \
 		ncurses-dev \
 		openssl \
 		openssl-dev \
+		patch \
 		procps \
 		readline-dev \
 		ruby \
diff --git a/ruby_2.6-alpine3.10/Dockerfile b/ruby_2.6-alpine3.11/Dockerfile
similarity index 99%
rename from ruby_2.6-alpine3.10/Dockerfile
rename to ruby_2.6-alpine3.11/Dockerfile
index dda82a0..5f78e80 100644
--- a/ruby_2.6-alpine3.10/Dockerfile
+++ b/ruby_2.6-alpine3.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
 
 RUN apk add --no-cache \
 		gmp-dev
@@ -40,6 +40,7 @@ RUN set -eux; \
 		ncurses-dev \
 		openssl \
 		openssl-dev \
+		patch \
 		procps \
 		readline-dev \
 		ruby \
diff --git a/ruby_alpine/Dockerfile b/ruby_alpine/Dockerfile
index e075c99..6f45f21 100644
--- a/ruby_alpine/Dockerfile
+++ b/ruby_alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 RUN apk add --no-cache \
 		gmp-dev
@@ -40,6 +40,7 @@ RUN set -eux; \
 		ncurses-dev \
 		openssl \
 		openssl-dev \
+		patch \
 		procps \
 		readline-dev \
 		ruby \
diff --git a/ruby_alpine3.10/Dockerfile b/ruby_alpine3.11/Dockerfile
similarity index 99%
rename from ruby_alpine3.10/Dockerfile
rename to ruby_alpine3.11/Dockerfile
index d237a1a..0936248 100644
--- a/ruby_alpine3.10/Dockerfile
+++ b/ruby_alpine3.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
 
 RUN apk add --no-cache \
 		gmp-dev
@@ -40,6 +40,7 @@ RUN set -eux; \
 		ncurses-dev \
 		openssl \
 		openssl-dev \
+		patch \
 		procps \
 		readline-dev \
 		ruby \

@yosifkit yosifkit merged commit e13f5f7 into docker-library:master Jun 11, 2020
@yosifkit yosifkit deleted the ruby branch June 11, 2020 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants