Update buildpack-deps #7985
Merged
Update buildpack-deps #7985
Conversation
This file contains hidden or 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
Changes: - docker-library/buildpack-deps@4d7c3e9: Merge pull request docker-library/buildpack-deps#108 from infosiftr/reorg - docker-library/buildpack-deps@f84f618: Reorganize repo so the "generate-stackbrew-library.sh" output is grouped by upstream (Debian vs Ubuntu) - docker-library/buildpack-deps@204fa8b: Merge pull request docker-library/buildpack-deps#107 from vicamo/for-upstream/add-ubuntu-groovy-gorilla - docker-library/buildpack-deps@836ce86: Add Ubuntu Groovy Gorilla - docker-library/buildpack-deps@1e2e728: Merge pull request docker-library/buildpack-deps#105 from docker-library/github-actions - docker-library/buildpack-deps@cc086a2: Add initial GitHub Actions CI
Diff for df78c64:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6afc31d..3114b43 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,135 +3,150 @@ GitRepo: https://github.com/docker-library/buildpack-deps.git
Tags: bionic-curl, 18.04-curl
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b0fc01aa5e3aed6820d8fed6f3301e0542fbeb36
-Directory: bionic/curl
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/bionic/curl
Tags: bionic-scm, 18.04-scm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0db0cf15f1c507b17e7edc6dfbe301b8e357568f
-Directory: bionic/scm
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/bionic/scm
Tags: bullseye-curl, testing-curl
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3c71697594e9eef1d673df9f1d379fdc0f7ff111
-Directory: bullseye/curl
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/bullseye/curl
Tags: bullseye-scm, testing-scm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3c71697594e9eef1d673df9f1d379fdc0f7ff111
-Directory: bullseye/scm
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/bullseye/scm
Tags: buster-curl, stable-curl, curl
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b0fc01aa5e3aed6820d8fed6f3301e0542fbeb36
-Directory: buster/curl
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/buster/curl
Tags: buster-scm, stable-scm, scm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 99a1c33fda559272e9322b02a5d778bbd04154e7
-Directory: buster/scm
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/buster/scm
Tags: eoan-curl, 19.10-curl
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7f5fa2e64174be2821552587b23f7d84b1dae71c
-Directory: eoan/curl
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/eoan/curl
Tags: eoan-scm, 19.10-scm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7f5fa2e64174be2821552587b23f7d84b1dae71c
-Directory: eoan/scm
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/eoan/scm
Tags: focal-curl, 20.04-curl
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1bf287b61b2c02d8890f4806a9bfb2c7042b308d
-Directory: focal/curl
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/focal/curl
Tags: focal-scm, 20.04-scm
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1bf287b61b2c02d8890f4806a9bfb2c7042b308d
-Directory: focal/scm
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/focal/scm
+
+Tags: groovy-curl, 20.10-curl
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/groovy/curl
+
+Tags: groovy-scm, 20.10-scm
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/groovy/scm
Tags: jessie-curl, oldoldstable-curl
Architectures: amd64, arm32v5, arm32v7, i386
-GitCommit: b0fc01aa5e3aed6820d8fed6f3301e0542fbeb36
-Directory: jessie/curl
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/jessie/curl
Tags: jessie-scm, oldoldstable-scm
Architectures: amd64, arm32v5, arm32v7, i386
-GitCommit: 1845b3f918f69b4c97912b0d4d68a5658458e84f
-Directory: jessie/scm
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/jessie/scm
Tags: sid-curl, unstable-curl
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b0fc01aa5e3aed6820d8fed6f3301e0542fbeb36
-Directory: sid/curl
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/sid/curl
Tags: sid-scm, unstable-scm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 99a1c33fda559272e9322b02a5d778bbd04154e7
-Directory: sid/scm
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/sid/scm
Tags: stretch-curl, oldstable-curl
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b0fc01aa5e3aed6820d8fed6f3301e0542fbeb36
-Directory: stretch/curl
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/stretch/curl
Tags: stretch-scm, oldstable-scm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 1845b3f918f69b4c97912b0d4d68a5658458e84f
-Directory: stretch/scm
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/stretch/scm
Tags: xenial-curl, 16.04-curl
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b0fc01aa5e3aed6820d8fed6f3301e0542fbeb36
-Directory: xenial/curl
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/xenial/curl
Tags: xenial-scm, 16.04-scm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2da658b9a1b91fa61d63ffad2ea52685cac6c702
-Directory: xenial/scm
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/xenial/scm
Tags: bionic, 18.04
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e0a5ed778b7140700d29bc445394f906946fbcd0
-Directory: bionic
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/bionic
Tags: bullseye, testing
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: e0a5ed778b7140700d29bc445394f906946fbcd0
-Directory: bullseye
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/bullseye
Tags: buster, stable, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: e0a5ed778b7140700d29bc445394f906946fbcd0
-Directory: buster
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/buster
Tags: eoan, 19.10
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e0a5ed778b7140700d29bc445394f906946fbcd0
-Directory: eoan
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/eoan
Tags: focal, 20.04
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e0a5ed778b7140700d29bc445394f906946fbcd0
-Directory: focal
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/focal
+
+Tags: groovy, 20.10
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/groovy
Tags: jessie, oldoldstable
Architectures: amd64, arm32v5, arm32v7, i386
-GitCommit: e0a5ed778b7140700d29bc445394f906946fbcd0
-Directory: jessie
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/jessie
Tags: sid, unstable
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: e0a5ed778b7140700d29bc445394f906946fbcd0
-Directory: sid
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/sid
Tags: stretch, oldstable
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: e0a5ed778b7140700d29bc445394f906946fbcd0
-Directory: stretch
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: debian/stretch
Tags: xenial, 16.04
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e0a5ed778b7140700d29bc445394f906946fbcd0
-Directory: xenial
+GitCommit: f84f6184d79f2cb7ab94c365ac4f47915e7ca2a8
+Directory: ubuntu/xenial
diff --git a/_bashbrew-list b/_bashbrew-list
index 80503fb..5d4a68e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -10,6 +10,9 @@ buildpack-deps:19.10-scm
buildpack-deps:20.04
buildpack-deps:20.04-curl
buildpack-deps:20.04-scm
+buildpack-deps:20.10
+buildpack-deps:20.10-curl
+buildpack-deps:20.10-scm
buildpack-deps:bionic
buildpack-deps:bionic-curl
buildpack-deps:bionic-scm
@@ -26,6 +29,9 @@ buildpack-deps:eoan-scm
buildpack-deps:focal
buildpack-deps:focal-curl
buildpack-deps:focal-scm
+buildpack-deps:groovy
+buildpack-deps:groovy-curl
+buildpack-deps:groovy-scm
buildpack-deps:jessie
buildpack-deps:jessie-curl
buildpack-deps:jessie-scm
diff --git a/buildpack-deps_19.10-curl/Dockerfile b/buildpack-deps_20.10-curl/Dockerfile
similarity index 94%
copy from buildpack-deps_19.10-curl/Dockerfile
copy to buildpack-deps_20.10-curl/Dockerfile
index 8e3a52c..4ce2ac7 100644
--- a/buildpack-deps_19.10-curl/Dockerfile
+++ b/buildpack-deps_20.10-curl/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:eoan
+FROM ubuntu:groovy
RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
diff --git a/buildpack-deps_16.04-scm/Dockerfile b/buildpack-deps_20.10-scm/Dockerfile
similarity index 88%
copy from buildpack-deps_16.04-scm/Dockerfile
copy to buildpack-deps_20.10-scm/Dockerfile
index 6bf403f..f461f09 100644
--- a/buildpack-deps_16.04-scm/Dockerfile
+++ b/buildpack-deps_20.10-scm/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:xenial-curl
+FROM buildpack-deps:groovy-curl
# procps is very common in build systems, and is a reasonably small package
RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/buildpack-deps_19.10/Dockerfile b/buildpack-deps_20.10/Dockerfile
similarity index 97%
copy from buildpack-deps_19.10/Dockerfile
copy to buildpack-deps_20.10/Dockerfile
index 79eef9c..60f25f5 100644
--- a/buildpack-deps_19.10/Dockerfile
+++ b/buildpack-deps_20.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:eoan-scm
+FROM buildpack-deps:groovy-scm
RUN set -ex; \
apt-get update; \ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Changes: