Merge branch 'main' into feat/db2

elastic · Jan 26, 2024 · f8a77e8 · f8a77e8
2 parents 20dc519 + afadbf3
commit f8a77e8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -17,11 +17,9 @@ endif
 endif
 
 # Requires login at google storage.
-copy-npcap: status=".status.copy-npcap"
 copy-npcap:
-	@echo '0' > ${status}
 ifeq ($(CI),true)
-	@gsutil cp gs://$(GS_BUCKET_PATH)/private/$(NPCAP_FILE) ../npcap/lib/$(NPCAP_FILE) || echo '1' > ${status}
+	@gsutil cp gs://$(GS_BUCKET_PATH)/private/$(NPCAP_FILE) ../npcap/lib/$(NPCAP_FILE) 
 else
 	@echo 'Only available if running in the CI'
 endif

diff --git a/go/Makefile.common b/go/Makefile.common
@@ -7,7 +7,7 @@ DEBIAN_VERSION ?= 9
 SUFFIX         := -$(shell basename $(CURDIR))
 TAG_EXTENSION  ?=
 
-export DEBIAN_VERSION TAG_EXTENSION
+export DEBIAN_VERSION TAG_EXTENSION NPCAP_FILE
 
 DOCKER_CMD := docker build
 

diff --git a/go/npcap/Dockerfile.tmpl b/go/npcap/Dockerfile.tmpl
@@ -3,7 +3,7 @@ ARG VERSION
 ARG TAG_EXTENSION=''
 FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-main${TAG_EXTENSION}
 
-COPY lib /installer
+COPY lib/{{.NPCAP_FILE}} /installer/
 
 # Build-time metadata as defined at http://label-schema.org.
 ARG BUILD_DATE