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.

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

Update buildpack-deps #10253

Merged
merged 1 commit into from
May 27, 2021

Conversation

tianon
Copy link
Member

@tianon tianon commented May 27, 2021

Changes:

Changes:

- docker-library/buildpack-deps@7780a9d: Merge pull request docker-library/buildpack-deps#121 from vicamo/for-upstream/add-ubuntu-impish
- docker-library/buildpack-deps@fae040f: Add Ubuntu Impish
@github-actions
Copy link

Diff for d8d7322:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index ff1ba17..0b7557a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -61,6 +61,16 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 98a5ab81d47a106c458cdf90733df0ee8beea06c
 Directory: ubuntu/hirsute/scm
 
+Tags: impish-curl, 21.10-curl
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: fae040f3db68991f178f0a9631a03ca9837f5647
+Directory: ubuntu/impish/curl
+
+Tags: impish-scm, 21.10-scm
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: fae040f3db68991f178f0a9631a03ca9837f5647
+Directory: ubuntu/impish/scm
+
 Tags: sid-curl, unstable-curl
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 98a5ab81d47a106c458cdf90733df0ee8beea06c
@@ -121,6 +131,11 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 98a5ab81d47a106c458cdf90733df0ee8beea06c
 Directory: ubuntu/hirsute
 
+Tags: impish, 21.10
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: fae040f3db68991f178f0a9631a03ca9837f5647
+Directory: ubuntu/impish
+
 Tags: sid, unstable
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 65d69325ad741cea6dee20781c1faaab2e003d87
diff --git a/_bashbrew-list b/_bashbrew-list
index 57245e5..7eb1950 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -13,6 +13,9 @@ buildpack-deps:20.10-scm
 buildpack-deps:21.04
 buildpack-deps:21.04-curl
 buildpack-deps:21.04-scm
+buildpack-deps:21.10
+buildpack-deps:21.10-curl
+buildpack-deps:21.10-scm
 buildpack-deps:bionic
 buildpack-deps:bionic-curl
 buildpack-deps:bionic-scm
@@ -32,6 +35,9 @@ buildpack-deps:groovy-scm
 buildpack-deps:hirsute
 buildpack-deps:hirsute-curl
 buildpack-deps:hirsute-scm
+buildpack-deps:impish
+buildpack-deps:impish-curl
+buildpack-deps:impish-scm
 buildpack-deps:latest
 buildpack-deps:oldstable
 buildpack-deps:oldstable-curl
diff --git a/buildpack-deps_20.04-curl/Dockerfile b/buildpack-deps_21.10-curl/Dockerfile
similarity index 96%
copy from buildpack-deps_20.04-curl/Dockerfile
copy to buildpack-deps_21.10-curl/Dockerfile
index c5f3538..7860a28 100644
--- a/buildpack-deps_20.04-curl/Dockerfile
+++ b/buildpack-deps_21.10-curl/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM ubuntu:focal
+FROM ubuntu:impish
 
 RUN set -eux; \
 	apt-get update; \
diff --git a/buildpack-deps_scm/Dockerfile b/buildpack-deps_21.10-scm/Dockerfile
similarity index 91%
copy from buildpack-deps_scm/Dockerfile
copy to buildpack-deps_21.10-scm/Dockerfile
index 878c5c1..9b58b4b 100644
--- a/buildpack-deps_scm/Dockerfile
+++ b/buildpack-deps_21.10-scm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:buster-curl
+FROM buildpack-deps:impish-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_20.04/Dockerfile b/buildpack-deps_21.10/Dockerfile
similarity index 97%
copy from buildpack-deps_20.04/Dockerfile
copy to buildpack-deps_21.10/Dockerfile
index 31e2b4a..613d5d5 100644
--- a/buildpack-deps_20.04/Dockerfile
+++ b/buildpack-deps_21.10/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:focal-scm
+FROM buildpack-deps:impish-scm
 
 RUN set -ex; \
 	apt-get update; \

@yosifkit yosifkit merged commit 7af47ad into docker-library:master May 27, 2021
@yosifkit yosifkit deleted the buildpack-deps branch May 27, 2021 19:30
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