Skip to content

Restore debian7 images needed for beats 7.17 #621

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.

Sign up for GitHub

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

Merged
mauri870 merged 3 commits into from
Jun 3, 2025
Merged

Restore debian7 images needed for beats 7.17 #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
766c370
restore debian7 images needed for beats 7.17
mauri870 May 28, 2025
3ca6f16
Restore readme changes
mauri870 May 28, 2025
1607b52
Merge branch 'main' into restore-debian7
v1v Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ steps:
setup:
makefile:
- "Makefile"
- "Makefile.debian7"
- "Makefile.debian9"
- "Makefile.debian10"
- "Makefile.debian11"
Expand Down Expand Up @@ -184,6 +185,7 @@ steps:
setup:
makefile:
- "Makefile"
- "Makefile.debian7"
- "Makefile.debian9"
- "Makefile.debian10"
- "Makefile.debian11"
Expand Down
1 change: 1 addition & 0 deletions .github/release-drafter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ 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-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
Expand Down
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ 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.debian9 $@ || echo '1' > ${status}; \
$(MAKE) -C $(var) -f Makefile.debian10 $@ || echo '1' > ${status}; \
$(MAKE) -C $(var) -f Makefile.debian11 $@ || echo '1' > ${status}; \
Expand All @@ -31,6 +32,7 @@ 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.debian9 $@ || echo '1' > ${status}; \
$(MAKE) -C $(var) -f Makefile.debian10 $@ || echo '1' > ${status}; \
$(MAKE) -C $(var) -f Makefile.debian11 $@ || echo '1' > ${status}; \
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ 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.debian9`
* `go/Makefile.debian10`
* `go/Makefile.debian11`
Expand Down
14 changes: 14 additions & 0 deletions go/Makefile.debian7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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