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 haproxy #8347

Merged
merged 1 commit into from
Jul 14, 2020
Merged

Update haproxy #8347

merged 1 commit into from
Jul 14, 2020

Conversation

tianon
Copy link
Member

@tianon tianon commented Jul 13, 2020

Changes:

Changes:

- docker-library/haproxy@319d41e: Merge pull request docker-library/haproxy#123 from infosiftr/dev-alias
- docker-library/haproxy@92f0eca: Replace "2.3-rc" alias with "2.3-dev"
@github-actions
Copy link

Diff for 36c8c1f:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9e8d6b5..f0a3432 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -61,12 +61,12 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: b9e54c2c29daa41f5045c7e95c887abe1933ea03
 Directory: 2.2/alpine
 
-Tags: 2.3-dev0, 2.3-rc
+Tags: 2.3-dev0, 2.3-dev
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: abcf89e58d99e59c1ce7c456ae5c218cdcc35052
 Directory: 2.3-rc
 
-Tags: 2.3-dev0-alpine, 2.3-rc-alpine
+Tags: 2.3-dev0-alpine, 2.3-dev-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: abcf89e58d99e59c1ce7c456ae5c218cdcc35052
 Directory: 2.3-rc/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index a0ab41c..eb65b07 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -24,10 +24,10 @@ haproxy:2.2
 haproxy:2.2-alpine
 haproxy:2.2.0
 haproxy:2.2.0-alpine
+haproxy:2.3-dev
 haproxy:2.3-dev0
 haproxy:2.3-dev0-alpine
-haproxy:2.3-rc
-haproxy:2.3-rc-alpine
+haproxy:2.3-dev-alpine
 haproxy:alpine
 haproxy:latest
 haproxy:lts
diff --git a/haproxy_2.3-rc-alpine/Dockerfile b/haproxy_2.3-dev-alpine/Dockerfile
similarity index 100%
rename from haproxy_2.3-rc-alpine/Dockerfile
rename to haproxy_2.3-dev-alpine/Dockerfile
diff --git a/haproxy_2.3-rc-alpine/docker-entrypoint.sh b/haproxy_2.3-dev-alpine/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.3-rc-alpine/docker-entrypoint.sh
rename to haproxy_2.3-dev-alpine/docker-entrypoint.sh
diff --git a/haproxy_2.3-rc/Dockerfile b/haproxy_2.3-dev/Dockerfile
similarity index 100%
rename from haproxy_2.3-rc/Dockerfile
rename to haproxy_2.3-dev/Dockerfile
diff --git a/haproxy_2.3-rc/docker-entrypoint.sh b/haproxy_2.3-dev/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.3-rc/docker-entrypoint.sh
rename to haproxy_2.3-dev/docker-entrypoint.sh

@yosifkit yosifkit merged commit 86fb918 into docker-library:master Jul 14, 2020
@yosifkit yosifkit deleted the haproxy branch July 14, 2020 01:54
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