Skip to content

Commit f53a560

Browse files
Reintroduce debian8 publishing for go 1.24 (#630)
1 parent 048c95c commit f53a560

File tree

6 files changed

+37
-1
lines changed

6 files changed

+37
-1
lines changed

.buildkite/pipeline.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ steps:
119119
makefile:
120120
- "Makefile"
121121
- "Makefile.debian7"
122+
- "Makefile.debian8"
122123
- "Makefile.debian9"
123124
- "Makefile.debian10"
124125
- "Makefile.debian11"
@@ -151,6 +152,7 @@ steps:
151152
matrix:
152153
setup:
153154
makefile:
155+
- "Makefile.debian8"
154156
- "Makefile.debian9"
155157
- "Makefile.debian10"
156158
- "Makefile.debian11"
@@ -186,6 +188,7 @@ steps:
186188
makefile:
187189
- "Makefile"
188190
- "Makefile.debian7"
191+
- "Makefile.debian8"
189192
- "Makefile.debian9"
190193
- "Makefile.debian10"
191194
- "Makefile.debian11"
@@ -218,6 +221,7 @@ steps:
218221
matrix:
219222
setup:
220223
makefile:
224+
- "Makefile.debian8"
221225
- "Makefile.debian9"
222226
- "Makefile.debian10"
223227
- "Makefile.debian11"

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ build:
1010
@$(foreach var,$(TARGETS), \
1111
$(MAKE) -C $(var) $@ || echo '1' > ${status}; \
1212
$(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status}; \
13+
$(MAKE) -C $(var) -f Makefile.debian8 $@ || echo '1' > ${status}; \
1314
$(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status}; \
1415
$(MAKE) -C $(var) -f Makefile.debian10 $@ || echo '1' > ${status}; \
1516
$(MAKE) -C $(var) -f Makefile.debian11 $@ || echo '1' > ${status}; \
@@ -33,6 +34,7 @@ push:
3334
@$(foreach var,$(TARGETS), \
3435
$(MAKE) -C $(var) $@ || echo '1' > ${status}; \
3536
$(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status}; \
37+
$(MAKE) -C $(var) -f Makefile.debian8 $@ || echo '1' > ${status}; \
3638
$(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status}; \
3739
$(MAKE) -C $(var) -f Makefile.debian10 $@ || echo '1' > ${status}; \
3840
$(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
@@ -120,6 +120,7 @@ The file `go/Makefile.common` is the default Makefile used to build the Docker i
120120
There is additional Makefile for each Debian version that is used to build the Docker images for that Debian version.
121121

122122
* `go/Makefile.debian7`
123+
* `go/Makefile.debian8`
123124
* `go/Makefile.debian9`
124125
* `go/Makefile.debian10`
125126
* `go/Makefile.debian11`

go/Makefile.debian8

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

go/base-arm/Dockerfile.tmpl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@ RUN \
2727
libicu-dev \
2828
icu-devtools \
2929
libsystemd-dev \
30-
{{- if eq .DEBIAN_VERSION "9" }}
30+
{{- if eq .DEBIAN_VERSION "8" }}
31+
libicu52 \
32+
librpm3 \
33+
librpmio3 \
34+
librpmbuild3 \
35+
librpmsign1 \
36+
{{- else if eq .DEBIAN_VERSION "9" }}
3137
libicu57 \
3238
librpm3 \
3339
librpmio3 \

go/base-arm/sources-debian8.list

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
deb [arch=arm64] http://archive.debian.org/debian jessie main

0 commit comments

Comments
 (0)