From 108ce8363c4d9ac2ec441fb115e6111aa90ad4b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Mon, 23 Oct 2023 12:32:46 +0800
Subject: [PATCH] feat: Add Haproxy Images

---
 library/haproxy/{2.7-dev6 => 2.8}/Dockerfile  |  20 ++--
 library/haproxy/{2.7-dev6 => 2.8}/Makefile    |   4 +-
 .../{2.7-dev6 => 2.8}/docker-entrypoint.sh    |   2 +-
 library/haproxy/2.9/Dockerfile                | 103 ++++++++++++++++++
 library/haproxy/2.9/Makefile                  |  20 ++++
 library/haproxy/2.9/docker-entrypoint.sh      |  17 +++
 6 files changed, 155 insertions(+), 11 deletions(-)
 rename library/haproxy/{2.7-dev6 => 2.8}/Dockerfile (78%)
 rename library/haproxy/{2.7-dev6 => 2.8}/Makefile (86%)
 rename library/haproxy/{2.7-dev6 => 2.8}/docker-entrypoint.sh (97%)
 mode change 100755 => 100644
 create mode 100644 library/haproxy/2.9/Dockerfile
 create mode 100644 library/haproxy/2.9/Makefile
 create mode 100644 library/haproxy/2.9/docker-entrypoint.sh

diff --git a/library/haproxy/2.7-dev6/Dockerfile b/library/haproxy/2.8/Dockerfile
similarity index 78%
rename from library/haproxy/2.7-dev6/Dockerfile
rename to library/haproxy/2.8/Dockerfile
index 25aade09..95a03299 100644
--- a/library/haproxy/2.7-dev6/Dockerfile
+++ b/library/haproxy/2.8/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM cr.loongnix.cn/loongson/loongnix:20
+FROM cr.loongnix.cn/library/debian:buster-slim
 
 # roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
 RUN set -eux; \
@@ -20,9 +20,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.7-dev6
-ENV HAPROXY_URL https://www.haproxy.org/download/2.7/src/devel/haproxy-2.7-dev6.tar.gz
-ENV HAPROXY_SHA256 6847fca460e31051cd1a4d667706e1419f49a9546bf5d4e72c19656115acf7d7
+ENV HAPROXY_VERSION 2.8.3
+ENV HAPROXY_URL https://www.haproxy.org/download/2.8/src/haproxy-2.8.3.tar.gz
+ENV HAPROXY_SHA256 9ecc6ffe67a977d1ed279107bbdab790d73ae2a626bc38eee23fa1f6786a759e
 
 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -eux; \
@@ -73,15 +73,15 @@ RUN set -eux; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
-	find /usr/local -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { print $(NF-1) }' \
+	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
 		| xargs -r dpkg-query --search \
 		| cut -d: -f1 \
 		| sort -u \
 		| xargs -r apt-mark manual \
 	; \
-#	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
 # smoke test
 	haproxy -v
@@ -96,4 +96,8 @@ COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]
 
 USER haproxy
-CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"]
+
+# https://github.com/docker-library/haproxy/issues/200
+WORKDIR /var/lib/haproxy
+
+CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"]
\ No newline at end of file
diff --git a/library/haproxy/2.7-dev6/Makefile b/library/haproxy/2.8/Makefile
similarity index 86%
rename from library/haproxy/2.7-dev6/Makefile
rename to library/haproxy/2.8/Makefile
index e3ac869d..3f299fe5 100644
--- a/library/haproxy/2.7-dev6/Makefile
+++ b/library/haproxy/2.8/Makefile
@@ -3,7 +3,7 @@
 REGISTRY?=cr.loongnix.cn
 ORGANIZATION?=library
 REPOSITORY?=haproxy
-TAG?=2.7-dev6
+TAG?=2.8
 
 IMAGE=$(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG)
 
@@ -11,10 +11,10 @@ IMAGE=$(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG)
 default: image
 
 image:
-	echo "0823 haproxy test"
 	docker build \
 		-t $(IMAGE) \
 		.
 
 push:
 	docker push $(IMAGE)
+	docker push $(IMAGE)-buster
diff --git a/library/haproxy/2.7-dev6/docker-entrypoint.sh b/library/haproxy/2.8/docker-entrypoint.sh
old mode 100755
new mode 100644
similarity index 97%
rename from library/haproxy/2.7-dev6/docker-entrypoint.sh
rename to library/haproxy/2.8/docker-entrypoint.sh
index 8b2093b0..15d5f72e
--- a/library/haproxy/2.7-dev6/docker-entrypoint.sh
+++ b/library/haproxy/2.8/docker-entrypoint.sh
@@ -14,4 +14,4 @@ if [ "$1" = 'haproxy' ]; then
 	set -- haproxy -W -db "$@"
 fi
 
-exec "$@"
+exec "$@"
\ No newline at end of file
diff --git a/library/haproxy/2.9/Dockerfile b/library/haproxy/2.9/Dockerfile
new file mode 100644
index 00000000..20afb066
--- /dev/null
+++ b/library/haproxy/2.9/Dockerfile
@@ -0,0 +1,103 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+FROM cr.loongnix.cn/library/debian:buster-slim
+
+# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
+RUN set -eux; \
+	groupadd --gid 99 --system haproxy; \
+	useradd \
+		--gid haproxy \
+		--home-dir /var/lib/haproxy \
+		--no-create-home \
+		--system \
+		--uid 99 \
+		haproxy \
+	; \
+	mkdir /var/lib/haproxy; \
+	chown haproxy:haproxy /var/lib/haproxy
+
+ENV HAPROXY_VERSION 2.9-dev8
+ENV HAPROXY_URL https://www.haproxy.org/download/2.9/src/devel/haproxy-2.9-dev8.tar.gz
+ENV HAPROXY_SHA256 4cb71352d92d863f7b79c702ca0abaad37541d54b8ab79fd8ec9d8ade16d131b
+
+# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
+RUN set -eux; \
+	\
+	savedAptMark="$(apt-mark showmanual)"; \
+	apt-get update && apt-get install -y --no-install-recommends \
+		ca-certificates \
+		gcc \
+		libc6-dev \
+		liblua5.3-dev \
+		libpcre2-dev \
+		libssl-dev \
+		make \
+		wget \
+	; \
+	rm -rf /var/lib/apt/lists/*; \
+	\
+	wget -O haproxy.tar.gz "$HAPROXY_URL"; \
+	echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c; \
+	mkdir -p /usr/src/haproxy; \
+	tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1; \
+	rm haproxy.tar.gz; \
+	\
+	makeOpts=' \
+		TARGET=linux-glibc \
+		USE_GETADDRINFO=1 \
+		USE_LUA=1 LUA_INC=/usr/include/lua5.3 \
+		USE_OPENSSL=1 \
+		USE_PCRE2=1 USE_PCRE2_JIT=1 \
+		USE_PROMEX=1 \
+		\
+		EXTRA_OBJS=" \
+		" \
+	'; \
+# https://salsa.debian.org/haproxy-team/haproxy/-/commit/53988af3d006ebcbf2c941e34121859fd6379c70
+	dpkgArch="$(dpkg --print-architecture)"; \
+	case "$dpkgArch" in \
+		armel) makeOpts="$makeOpts ADDLIB=-latomic" ;; \
+	esac; \
+	\
+	nproc="$(nproc)"; \
+	eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts"; \
+	eval "make -C /usr/src/haproxy install-bin $makeOpts"; \
+	\
+	mkdir -p /usr/local/etc/haproxy; \
+	cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors; \
+	rm -rf /usr/src/haproxy; \
+	\
+	apt-mark auto '.*' > /dev/null; \
+	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
+	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
+		| sort -u \
+		| xargs -r dpkg-query --search \
+		| cut -d: -f1 \
+		| sort -u \
+		| xargs -r apt-mark manual \
+	; \
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	\
+# smoke test
+	haproxy -v
+
+# https://www.haproxy.org/download/1.8/doc/management.txt
+# "4. Stopping and restarting HAProxy"
+# "when the SIGTERM signal is sent to the haproxy process, it immediately quits and all established connections are closed"
+# "graceful stop is triggered when the SIGUSR1 signal is sent to the haproxy process"
+STOPSIGNAL SIGUSR1
+
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+USER haproxy
+
+# https://github.com/docker-library/haproxy/issues/200
+WORKDIR /var/lib/haproxy
+
+CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"]
\ No newline at end of file
diff --git a/library/haproxy/2.9/Makefile b/library/haproxy/2.9/Makefile
new file mode 100644
index 00000000..b06555dd
--- /dev/null
+++ b/library/haproxy/2.9/Makefile
@@ -0,0 +1,20 @@
+# This file is generated by the template.
+
+REGISTRY?=cr.loongnix.cn
+ORGANIZATION?=library
+REPOSITORY?=haproxy
+TAG?=2.9-dev
+
+IMAGE=$(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG)
+
+
+default: image
+
+image:
+	docker build \
+		-t $(IMAGE) \
+		.
+
+push:
+	docker push $(IMAGE)
+	docker push $(IMAGE)-buster
diff --git a/library/haproxy/2.9/docker-entrypoint.sh b/library/haproxy/2.9/docker-entrypoint.sh
new file mode 100644
index 00000000..15d5f72e
--- /dev/null
+++ b/library/haproxy/2.9/docker-entrypoint.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- haproxy "$@"
+fi
+
+if [ "$1" = 'haproxy' ]; then
+	shift # "haproxy"
+	# if the user wants "haproxy", let's add a couple useful flags
+	#   -W  -- "master-worker mode" (similar to the old "haproxy-systemd-wrapper"; allows for reload via "SIGUSR2")
+	#   -db -- disables background mode
+	set -- haproxy -W -db "$@"
+fi
+
+exec "$@"
\ No newline at end of file