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 #6109

Merged
merged 1 commit into from
Jun 18, 2019

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 18, 2019

Changes:

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index c4fbfaf..1a1d966 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,18 +1,3 @@
-buildpack-deps:14.04 @ amd64
-buildpack-deps:14.04 @ arm32v7
-buildpack-deps:14.04 @ arm64v8
-buildpack-deps:14.04 @ i386
-buildpack-deps:14.04 @ ppc64le
-buildpack-deps:14.04-curl @ amd64
-buildpack-deps:14.04-curl @ arm32v7
-buildpack-deps:14.04-curl @ arm64v8
-buildpack-deps:14.04-curl @ i386
-buildpack-deps:14.04-curl @ ppc64le
-buildpack-deps:14.04-scm @ amd64
-buildpack-deps:14.04-scm @ arm32v7
-buildpack-deps:14.04-scm @ arm64v8
-buildpack-deps:14.04-scm @ i386
-buildpack-deps:14.04-scm @ ppc64le
 buildpack-deps:16.04 @ amd64
 buildpack-deps:16.04 @ arm32v7
 buildpack-deps:16.04 @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 17d70b4..0d995e6 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,3 @@
-buildpack-deps:14.04
-buildpack-deps:14.04-curl
-buildpack-deps:14.04-scm
 buildpack-deps:16.04
 buildpack-deps:16.04-curl
 buildpack-deps:16.04-scm
@@ -46,9 +43,6 @@ buildpack-deps:stretch-scm
 buildpack-deps:testing
 buildpack-deps:testing-curl
 buildpack-deps:testing-scm
-buildpack-deps:trusty
-buildpack-deps:trusty-curl
-buildpack-deps:trusty-scm
 buildpack-deps:unstable
 buildpack-deps:unstable-curl
 buildpack-deps:unstable-scm
diff --git a/buildpack-deps_14.04-curl/Dockerfile b/buildpack-deps_14.04-curl/Dockerfile
deleted file mode 100644
index 39f0134..0000000
diff --git a/buildpack-deps_14.04-scm/Dockerfile b/buildpack-deps_14.04-scm/Dockerfile
deleted file mode 100644
index cf40118..0000000
diff --git a/buildpack-deps_14.04/Dockerfile b/buildpack-deps_14.04/Dockerfile
deleted file mode 100644
index a742353..0000000

@yosifkit yosifkit merged commit 7911f88 into docker-library:master Jun 18, 2019
@yosifkit yosifkit deleted the buildpack-deps branch June 18, 2019 21:57
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