Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ steps:
makefile:
- "Makefile"
- "Makefile.debian7"
- "Makefile.debian8"
- "Makefile.debian9"
- "Makefile.debian10"
- "Makefile.debian11"
Expand Down Expand Up @@ -151,6 +152,7 @@ steps:
matrix:
setup:
makefile:
- "Makefile.debian8"
- "Makefile.debian9"
- "Makefile.debian10"
- "Makefile.debian11"
Expand Down Expand Up @@ -186,6 +188,7 @@ steps:
makefile:
- "Makefile"
- "Makefile.debian7"
- "Makefile.debian8"
- "Makefile.debian9"
- "Makefile.debian10"
- "Makefile.debian11"
Expand Down Expand Up @@ -218,6 +221,7 @@ steps:
matrix:
setup:
makefile:
- "Makefile.debian8"
- "Makefile.debian9"
- "Makefile.debian10"
- "Makefile.debian11"
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ build:
@$(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}; \
Expand All @@ -33,6 +34,7 @@ push:
@$(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}; \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ The file `go/Makefile.common` is the default Makefile used to build the Docker i
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`
Expand Down
22 changes: 22 additions & 0 deletions go/Makefile.debian8
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
IMAGES := base main darwin npcap
ARM_IMAGES := base-arm
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;)

build-arm:
@$(foreach var,$(ARM_IMAGES),$(MAKE) -C $(var) build-arm || exit 1;)

# Requires login at https://docker.elastic.co:7000/.
push:
@$(foreach var,$(IMAGES),$(MAKE) -C $(var) push || exit 1;)

push-arm:
@$(foreach var,$(ARM_IMAGES),$(MAKE) -C $(var) push-arm || exit 1;)

.PHONY: build build-arm push push-arm
8 changes: 7 additions & 1 deletion go/base-arm/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ RUN \
libicu-dev \
icu-devtools \
libsystemd-dev \
{{- if eq .DEBIAN_VERSION "9" }}
{{- if eq .DEBIAN_VERSION "8" }}
libicu52 \
librpm3 \
librpmio3 \
librpmbuild3 \
librpmsign1 \
{{- else if eq .DEBIAN_VERSION "9" }}
libicu57 \
librpm3 \
librpmio3 \
Expand Down
1 change: 1 addition & 0 deletions go/base-arm/sources-debian8.list
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
deb [arch=arm64] http://archive.debian.org/debian jessie main