From 82414294242aa451d95252f0bbf1ff0d504042b1 Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Thu, 8 May 2025 10:46:21 +0200
Subject: [PATCH] Revert "stop publishing debian7 and debian8 from 1.23.7
 onwards (#510)"

This reverts commit 3caff4e3d8e7ccd4a469972c5df80acae1fe8992.
---
 .buildkite/pipeline.yml     |  4 ++++
 .github/release-drafter.yml |  2 ++
 Makefile                    |  4 ++++
 README.md                   |  2 ++
 go/Makefile.debian7         | 14 ++++++++++++++
 go/Makefile.debian8         | 15 +++++++++++++++
 6 files changed, 41 insertions(+)
 create mode 100644 go/Makefile.debian7
 create mode 100644 go/Makefile.debian8

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 14ace687..e7dd269d 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -37,6 +37,8 @@ steps:
           setup:
             makefile:
               - "Makefile"
+              - "Makefile.debian7"
+              - "Makefile.debian8"
               - "Makefile.debian9"
               - "Makefile.debian10"
               - "Makefile.debian11"
@@ -99,6 +101,8 @@ steps:
           setup:
             makefile:
               - "Makefile"
+              - "Makefile.debian7"
+              - "Makefile.debian8"
               - "Makefile.debian9"
               - "Makefile.debian10"
               - "Makefile.debian11"
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 6462717e..6969d0f5 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -48,6 +48,8 @@ template: |
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-base`
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-darwin` - darwin/amd64 (MacOS 10.11, MacOS 10.14)
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main` - linux/i386, linux/amd64, windows/amd64
+  - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian7` - linux/i386, linux/amd64, windows/amd64
+  - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian8` - linux/i386, linux/amd64, windows/amd64
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian9` - linux/i386, linux/amd64, windows/amd64
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian10` - linux/i386, linux/amd64, windows/amd64
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian11` - linux/i386, linux/amd64, windows/amd64
diff --git a/Makefile b/Makefile
index 17fde875..29cbf8d6 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@ build:
 	@echo '0' > ${status}
 	@$(foreach var,$(TARGETS), \
 		$(MAKE) -C $(var) $@ || echo '1' > ${status}; \
+		$(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status}; \
+		$(MAKE) -C $(var) -f Makefile.debian8 $@ || echo '1' > ${status}; \
 		$(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status}; \
 		$(MAKE) -C $(var) -f Makefile.debian10 $@ || echo '1' > ${status}; \
 		$(MAKE) -C $(var) -f Makefile.debian11 $@ || echo '1' > ${status}; \
@@ -31,6 +33,8 @@ push:
 	@echo '0' > ${status}
 	@$(foreach var,$(TARGETS), \
 		$(MAKE) -C $(var) $@ || echo '1' > ${status}; \
+		$(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status}; \
+		$(MAKE) -C $(var) -f Makefile.debian8 $@ || echo '1' > ${status}; \
 		$(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status}; \
 		$(MAKE) -C $(var) -f Makefile.debian10 $@ || echo '1' > ${status}; \
 		$(MAKE) -C $(var) -f Makefile.debian11 $@ || echo '1' > ${status}; \
diff --git a/README.md b/README.md
index f3a6244d..65fee6ae 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,8 @@ it triggers the build of all Docker images for all architectures and Debian vers
 The file `go/Makefile.common` is the default Makefile used to build the Docker images for the different architectures.
 There is additional Makefile for each Debian version that is used to build the Docker images for that Debian version.
 
+* `go/Makefile.debian7`
+* `go/Makefile.debian8`
 * `go/Makefile.debian9`
 * `go/Makefile.debian10`
 * `go/Makefile.debian11`
diff --git a/go/Makefile.debian7 b/go/Makefile.debian7
new file mode 100644
index 00000000..c94da8a0
--- /dev/null
+++ b/go/Makefile.debian7
@@ -0,0 +1,14 @@
+IMAGES         := base main
+DEBIAN_VERSION := 7
+TAG_EXTENSION  := -debian7
+
+export DEBIAN_VERSION TAG_EXTENSION
+
+build:
+	@$(foreach var,$(IMAGES),$(MAKE) -C $(var) build || exit 1;)
+
+# Requires login at https://docker.elastic.co:7000/.
+push:
+	@$(foreach var,$(IMAGES),$(MAKE) -C $(var) push || exit 1;)
+
+.PHONY: build push
diff --git a/go/Makefile.debian8 b/go/Makefile.debian8
new file mode 100644
index 00000000..ad60c8dc
--- /dev/null
+++ b/go/Makefile.debian8
@@ -0,0 +1,15 @@
+IMAGES         := base main darwin npcap
+DEBIAN_VERSION := 8
+TAG_EXTENSION  := -debian8
+
+export DEBIAN_VERSION TAG_EXTENSION
+
+build:
+	export |grep TAG_EXTENSION
+	@$(foreach var,$(IMAGES),$(MAKE) -C $(var) build || exit 1;)
+
+# Requires login at https://docker.elastic.co:7000/.
+push:
+	@$(foreach var,$(IMAGES),$(MAKE) -C $(var) push || exit 1;)
+
+.PHONY: build push