Skip to content

Commit 9897b55

Browse files
mauri870v1v
andauthored
Restore debian7 images needed for beats 7.17 (#621)
Co-authored-by: Victor Martinez <[email protected]>
1 parent fa5e956 commit 9897b55

File tree

5 files changed

+20
-0
lines changed

5 files changed

+20
-0
lines changed

.buildkite/pipeline.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ steps:
118118
setup:
119119
makefile:
120120
- "Makefile"
121+
- "Makefile.debian7"
121122
- "Makefile.debian9"
122123
- "Makefile.debian10"
123124
- "Makefile.debian11"
@@ -184,6 +185,7 @@ steps:
184185
setup:
185186
makefile:
186187
- "Makefile"
188+
- "Makefile.debian7"
187189
- "Makefile.debian9"
188190
- "Makefile.debian10"
189191
- "Makefile.debian11"

.github/release-drafter.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ template: |
4848
- `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-base`
4949
- `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-darwin` - darwin/amd64 (MacOS 10.11, MacOS 10.14)
5050
- `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main` - linux/i386, linux/amd64, windows/amd64
51+
- `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian7` - linux/i386, linux/amd64, windows/amd64
5152
- `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian9` - linux/i386, linux/amd64, windows/amd64
5253
- `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian10` - linux/i386, linux/amd64, windows/amd64
5354
- `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian11` - linux/i386, linux/amd64, windows/amd64

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ build:
99
@echo '0' > ${status}
1010
@$(foreach var,$(TARGETS), \
1111
$(MAKE) -C $(var) $@ || echo '1' > ${status}; \
12+
$(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status}; \
1213
$(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status}; \
1314
$(MAKE) -C $(var) -f Makefile.debian10 $@ || echo '1' > ${status}; \
1415
$(MAKE) -C $(var) -f Makefile.debian11 $@ || echo '1' > ${status}; \
@@ -31,6 +32,7 @@ push:
3132
@echo '0' > ${status}
3233
@$(foreach var,$(TARGETS), \
3334
$(MAKE) -C $(var) $@ || echo '1' > ${status}; \
35+
$(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status}; \
3436
$(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status}; \
3537
$(MAKE) -C $(var) -f Makefile.debian10 $@ || echo '1' > ${status}; \
3638
$(MAKE) -C $(var) -f Makefile.debian11 $@ || echo '1' > ${status}; \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ it triggers the build of all Docker images for all architectures and Debian vers
119119
The file `go/Makefile.common` is the default Makefile used to build the Docker images for the different architectures.
120120
There is additional Makefile for each Debian version that is used to build the Docker images for that Debian version.
121121

122+
* `go/Makefile.debian7`
122123
* `go/Makefile.debian9`
123124
* `go/Makefile.debian10`
124125
* `go/Makefile.debian11`

go/Makefile.debian7

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
IMAGES := base main
2+
DEBIAN_VERSION := 7
3+
TAG_EXTENSION := -debian7
4+
5+
export DEBIAN_VERSION TAG_EXTENSION
6+
7+
build:
8+
@$(foreach var,$(IMAGES),$(MAKE) -C $(var) build || exit 1;)
9+
10+
# Requires login at https://docker.elastic.co:7000/.
11+
push:
12+
@$(foreach var,$(IMAGES),$(MAKE) -C $(var) push || exit 1;)
13+
14+
.PHONY: build push

0 commit comments

Comments
 (0)