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 docker #6624

Merged
merged 1 commit into from
Sep 12, 2019
Merged

Update docker #6624

merged 1 commit into from
Sep 12, 2019

Conversation

tianon
Copy link
Member

@tianon tianon commented Sep 12, 2019

Changes:

Changes:

- docker-library/docker@487a0ba: Merge pull request docker-library/docker#189 from tao12345666333/18.09-eol
- docker-library/docker@38da344: Remove EOL 18.09.
@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index e51022f..64258e9 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,15 +1,3 @@
-docker:18 @ amd64
-docker:18 @ arm32v6
-docker:18 @ arm32v7
-docker:18 @ arm64v8
-docker:18-dind @ amd64
-docker:18-dind @ arm32v6
-docker:18-dind @ arm32v7
-docker:18-dind @ arm64v8
-docker:18-git @ amd64
-docker:18-git @ arm32v6
-docker:18-git @ arm32v7
-docker:18-git @ arm64v8
 docker:dind @ amd64
 docker:dind @ arm32v6
 docker:dind @ arm32v7
diff --git a/_bashbrew-list b/_bashbrew-list
index 6aaf743..e8cfc94 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,12 +1,3 @@
-docker:18
-docker:18-dind
-docker:18-git
-docker:18.09
-docker:18.09-dind
-docker:18.09-git
-docker:18.09.9
-docker:18.09.9-dind
-docker:18.09.9-git
 docker:19
 docker:19-dind
 docker:19-dind-rootless
diff --git a/docker_18-dind/Dockerfile b/docker_18-dind/Dockerfile
deleted file mode 100644
index 42d2d48..0000000
diff --git a/docker_18-dind/dockerd-entrypoint.sh b/docker_18-dind/dockerd-entrypoint.sh
deleted file mode 100755
index 8015b39..0000000
diff --git a/docker_18-git/Dockerfile b/docker_18-git/Dockerfile
deleted file mode 100644
index 2e79c60..0000000
diff --git a/docker_18/Dockerfile b/docker_18/Dockerfile
deleted file mode 100644
index cd26792..0000000
diff --git a/docker_18/docker-entrypoint.sh b/docker_18/docker-entrypoint.sh
deleted file mode 100755
index d41cef8..0000000
diff --git a/docker_18/modprobe.sh b/docker_18/modprobe.sh
deleted file mode 100755
index b357d89..0000000

@yosifkit yosifkit merged commit 289528d into docker-library:master Sep 12, 2019
@yosifkit yosifkit deleted the docker branch September 12, 2019 22:34
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