From 9f9b34a848b8d4554470492120357a5de9d2f962 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Wed, 11 Sep 2024 16:34:13 -0400
Subject: [PATCH 01/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index c552e9bb..190a724d 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -61,7 +61,7 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && CGO_ENABLED=0 go build -o /crossbuild /entrypoint.go \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
-RUN curl -sSLO https://storage.googleapis.com/obs-ci-cache/beats/libpcap-1.8.1.tar.gz \
+RUN curl -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/libpcap-1.8.1.tar.gz \
   && echo "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e  libpcap-1.8.1.tar.gz" | sha256sum -c - \
   && mkdir /libpcap \
 	&& tar -xzf libpcap-1.8.1.tar.gz -C /libpcap \

From 79c78898a6236927bca362dc587972d328bbe265 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Wed, 11 Sep 2024 16:35:08 -0400
Subject: [PATCH 02/62] Update Dockerfile.tmpl

---
 go/main/Dockerfile.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/go/main/Dockerfile.tmpl b/go/main/Dockerfile.tmpl
index 12192837..c5db65b7 100644
--- a/go/main/Dockerfile.tmpl
+++ b/go/main/Dockerfile.tmpl
@@ -59,7 +59,7 @@ RUN cd /libpcap/libpcap-1.8.1 \
   && ./configure --enable-usb=no --enable-bluetooth=no --enable-dbus=no \
   && make
 
-RUN curl -sSLO https://storage.googleapis.com/obs-ci-cache/beats/WpdPack_4_1_2.zip \
+RUN curl -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/WpdPack_4_1_2.zip \
   && mkdir -p /libpcap/win \
   && echo "ea799cf2f26e4afb1892938070fd2b1ca37ce5cf75fec4349247df12b784edbd  WpdPack_4_1_2.zip" | sha256sum -c - \
   && unzip WpdPack_4_1_2.zip -d /libpcap/win \
@@ -84,4 +84,4 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
   org.label-schema.name=$IMAGE \
   org.label-schema.vcs-ref=$VCS_REF \
   org.label-schema.vcs-url=$VCS_URL \
-  org.label-schema.schema-version="1.0"
\ No newline at end of file
+  org.label-schema.schema-version="1.0"

From 1c27a1e59673bc380cdf0af01826de897531bd8a Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Wed, 11 Sep 2024 16:35:54 -0400
Subject: [PATCH 03/62] Update Dockerfile.tmpl

---
 go/darwin/Dockerfile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index 6d221e88..dcd170b9 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -38,7 +38,7 @@ COPY --from=build-llvm-apple /osxcross.tar.gz /tmp/osxcross.tar.gz
 RUN tar -xzf /tmp/osxcross.tar.gz -C / \
   && rm /tmp/osxcross.tar.gz
 {{- else }}
-ARG OSXCROSS_SDK_URL=https://storage.googleapis.com/obs-ci-cache/beats/MacOSX10.11.sdk.tar.xz
+ARG OSXCROSS_SDK_URL=https://storage.googleapis.com/ingest-buildkite-ci/sdks/MacOSX10.11.sdk.tar.xz
 ARG OSXCROSS_PATH=/usr/osxcross
 ARG OSXCROSS_REV=3034f7149716d815bc473d0a7b35d17e4cf175aa
 ARG SDK_VERSION=10.11

From fafd1b925a2c52225b0aa409f994bfc59d1095e8 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Wed, 11 Sep 2024 16:36:39 -0400
Subject: [PATCH 04/62] Update Dockerfile.tmpl

---
 go/llvm-apple/Dockerfile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/llvm-apple/Dockerfile.tmpl b/go/llvm-apple/Dockerfile.tmpl
index 3fac7e93..942fb98f 100644
--- a/go/llvm-apple/Dockerfile.tmpl
+++ b/go/llvm-apple/Dockerfile.tmpl
@@ -52,7 +52,7 @@ ARG OSX_SDK="MacOSX11.3.sdk"
 # Packaging the SDK on macOS https://github.com/tpoechtrager/osxcross#packaging-the-sdk
 # alternative SDK already generated
 #ARG OSXCROSS_SDK_URL=https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/${OSX_SDK}.tar.xz
-ARG OSXCROSS_SDK_URL=https://storage.googleapis.com/obs-ci-cache/beats/${OSX_SDK}.tar.xz
+ARG OSXCROSS_SDK_URL=https://storage.googleapis.com/ingest-buildkite-ci/sdks/${OSX_SDK}.tar.xz
 ARG OSXCROSS_PATH=/usr/local/osxcross
 ARG OSXCROSS_REV=062922bbb81ac52787d8e53fa4af190acb552ec7
 ARG OSX_VERSION_MIN=10.10

From 98f7ed2b6bd16637d944ff37cc07e7d1d0a3ecfe Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Wed, 11 Sep 2024 16:37:23 -0400
Subject: [PATCH 05/62] Update Dockerfile.tmpl

---
 go/base-arm/Dockerfile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/base-arm/Dockerfile.tmpl b/go/base-arm/Dockerfile.tmpl
index 6d1ea1b8..419a5c0b 100644
--- a/go/base-arm/Dockerfile.tmpl
+++ b/go/base-arm/Dockerfile.tmpl
@@ -68,7 +68,7 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION-arm \
     && go build -o /crossbuild /entrypoint.go \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
-RUN curl -sSLO https://storage.googleapis.com/obs-ci-cache/beats/libpcap-1.8.1.tar.gz \
+RUN curl -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/libpcap-1.8.1.tar.gz \
   && mkdir /libpcap \
 	&& tar -xzf libpcap-1.8.1.tar.gz -C /libpcap \
   && cd /libpcap/libpcap-1.8.1 \

From 7e47a113d2b005ecfc9fd1435c9401ed5d48dc2f Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Wed, 11 Sep 2024 16:41:51 -0400
Subject: [PATCH 06/62] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ba113c9f..af3f433c 100644
--- a/README.md
+++ b/README.md
@@ -291,7 +291,7 @@ It was added to golang-crossbuild due limitations of the build system.
 The `main` image is the base image for the `amd64` architecture, it is build for Debian 7+.
 It is used to cross compile for `linux/amd`, `linux/amd64`, `win/amd`, and `win/amd64`.
 This Docker immage add two libraries to the `base` image, `libpcap` and `WpdPack` to be able to capture network packages on diferent OS.
-Thes two libraries are precompiled and stores at https://storage.googleapis.com/obs-ci-cache.
+Thes two libraries are precompiled and stored at https://storage.googleapis.com/ingest-buildkite-ci/sdks.
 
 ## go/darwin Docker image
 
@@ -378,5 +378,5 @@ XCODEDIR=osxcross/build/tmp_<X> ./tools/gen_sdk_package.sh
 The SDK should be in the working directory.
 The tmp dir can be safely deleted after this.
 
-The SDKs should be uploaded into the `gs://obs-ci-cache` bucket on GCP (Google Cloud Platform).
-This is accessible to authorized users in the `elastic-observability` project [here](https://console.cloud.google.com/storage/browser/obs-ci-cache).
+The SDKs should be uploaded into the `gs://ingest-buildkite-ci/sdks` bucket on GCP (Google Cloud Platform).
+This is accessible to authorized users in the `platform-ingest` project [here](https://console.cloud.google.com/storage/browser/ingest-buildkite-ci/sdks).

From 80e994803ebfc9b771941df250b6df9c8393a910 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Wed, 11 Sep 2024 16:59:59 -0400
Subject: [PATCH 07/62] Update pre-command gcp cred path

---
 .buildkite/hooks/pre-command | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index c5a98fc6..e4502133 100644
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -5,7 +5,7 @@ set -euo pipefail
 source .buildkite/scripts/common.sh
 
 DOCKER_REGISTRY_SECRET_PATH="kv/ci-shared/platform-ingest/docker_registry_prod"
-PRIVATE_CI_GCS_CREDENTIALS_PATH="kv/ci-shared/observability-ingest/cloud/gcp"
+PRIVATE_CI_GCS_CREDENTIALS_PATH="kv/ci-shared/platform-ingest/gcp-platform-ingest-ci-service-account"
 
 # Secrets must be redacted
 # https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables

From c11e968e0ebff42e9a5a49d1d8d4f8ba635caecb Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Thu, 19 Sep 2024 11:53:12 -0400
Subject: [PATCH 08/62] Try switching the secret back to o11y

---
 .buildkite/hooks/pre-command | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index e4502133..c5a98fc6 100644
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -5,7 +5,7 @@ set -euo pipefail
 source .buildkite/scripts/common.sh
 
 DOCKER_REGISTRY_SECRET_PATH="kv/ci-shared/platform-ingest/docker_registry_prod"
-PRIVATE_CI_GCS_CREDENTIALS_PATH="kv/ci-shared/platform-ingest/gcp-platform-ingest-ci-service-account"
+PRIVATE_CI_GCS_CREDENTIALS_PATH="kv/ci-shared/observability-ingest/cloud/gcp"
 
 # Secrets must be redacted
 # https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables

From 2d455f593311b730b4977648c0204958d8b1a0ad Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Thu, 19 Sep 2024 12:10:33 -0400
Subject: [PATCH 09/62] Comment out sha checking for testing

---
 go/base/Dockerfile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index 2848ca6d..ca95dcdb 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -62,7 +62,7 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
 RUN curl -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/libpcap-1.8.1.tar.gz \
-  && echo "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e  libpcap-1.8.1.tar.gz" | sha256sum -c - \
+  # && echo "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e  libpcap-1.8.1.tar.gz" | sha256sum -c - \
   && mkdir /libpcap \
 	&& tar -xzf libpcap-1.8.1.tar.gz -C /libpcap \
   && rm libpcap-1.8.1.tar.gz

From ccb79e87603d74a3a92aefc75e33ab4f0ce5fa88 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Thu, 19 Sep 2024 15:50:25 -0400
Subject: [PATCH 10/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index ca95dcdb..ec620d69 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -62,6 +62,7 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
 RUN curl -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/libpcap-1.8.1.tar.gz \
+  && ls -la libpcap-1.8.1.tar.gz \
   # && echo "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e  libpcap-1.8.1.tar.gz" | sha256sum -c - \
   && mkdir /libpcap \
 	&& tar -xzf libpcap-1.8.1.tar.gz -C /libpcap \

From 6d372278d6a4c1905b8f079b2a3c1b18acbfed84 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:09:23 -0400
Subject: [PATCH 11/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index ec620d69..a980d9e7 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -62,7 +62,7 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
 RUN curl -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/libpcap-1.8.1.tar.gz \
-  && ls -la libpcap-1.8.1.tar.gz \
+  && cat libpcap-1.8.1.tar.gz \
   # && echo "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e  libpcap-1.8.1.tar.gz" | sha256sum -c - \
   && mkdir /libpcap \
 	&& tar -xzf libpcap-1.8.1.tar.gz -C /libpcap \

From 45a12695622111652f4b0a40681c3a8c0310fa46 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:56:30 -0400
Subject: [PATCH 12/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index a980d9e7..e045edb1 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -61,8 +61,8 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && CGO_ENABLED=0 go build -o /crossbuild /entrypoint.go \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
-RUN curl -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/libpcap-1.8.1.tar.gz \
-  && cat libpcap-1.8.1.tar.gz \
+RUN curl -H "Authorization: Bearer \"$(gcloud auth application-default print-access-token)\"" -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/libpcap-1.8.1.tar.gz \
+  && ls -la libpcap-1.8.1.tar.gz \
   # && echo "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e  libpcap-1.8.1.tar.gz" | sha256sum -c - \
   && mkdir /libpcap \
 	&& tar -xzf libpcap-1.8.1.tar.gz -C /libpcap \

From 758adaf407ad1565add9237b273ef11eec093e3b Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Thu, 19 Sep 2024 17:12:02 -0400
Subject: [PATCH 13/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index e045edb1..d9612c84 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -14,6 +14,7 @@ RUN apt-get -o Acquire::Check-Valid-Until=false update -y --no-install-recommend
             curl \
             git \
             gnupg \
+            google-cloud-cli \
             make \
             file \
             flex \

From dae9ff6a10e61d5e9c7602c83e8852e662905f28 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Thu, 19 Sep 2024 17:20:04 -0400
Subject: [PATCH 14/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index d9612c84..634be128 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -14,7 +14,6 @@ RUN apt-get -o Acquire::Check-Valid-Until=false update -y --no-install-recommend
             curl \
             git \
             gnupg \
-            google-cloud-cli \
             make \
             file \
             flex \
@@ -28,6 +27,14 @@ RUN apt-get -o Acquire::Check-Valid-Until=false update -y --no-install-recommend
 {{- end }}
         && rm -rf /var/lib/apt/lists/*
 
+# copied from https://github.com/elastic/release-eng/blob/main/containers/download-page-publisher/Dockerfile
+# Install Google Cloud SDK
+RUN echo "deb https://packages.cloud.google.com/apt cloud-sdk main" > /etc/apt/sources.list.d/google-cloud-sdk.list \
+    && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \
+    && apt-get update -y && apt-get install google-cloud-cli -y --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean
+
 {{- if eq .DEBIAN_VERSION "10"}}
 RUN ln -s /usr/bin/pip3 /usr/bin/pip
 {{- end }}

From f3052bb67b84aaa69dfa68e4cc67d6f2d6b30358 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 15:29:07 -0400
Subject: [PATCH 15/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index 634be128..ec620d69 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -27,14 +27,6 @@ RUN apt-get -o Acquire::Check-Valid-Until=false update -y --no-install-recommend
 {{- end }}
         && rm -rf /var/lib/apt/lists/*
 
-# copied from https://github.com/elastic/release-eng/blob/main/containers/download-page-publisher/Dockerfile
-# Install Google Cloud SDK
-RUN echo "deb https://packages.cloud.google.com/apt cloud-sdk main" > /etc/apt/sources.list.d/google-cloud-sdk.list \
-    && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \
-    && apt-get update -y && apt-get install google-cloud-cli -y --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean
-
 {{- if eq .DEBIAN_VERSION "10"}}
 RUN ln -s /usr/bin/pip3 /usr/bin/pip
 {{- end }}
@@ -69,7 +61,7 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && CGO_ENABLED=0 go build -o /crossbuild /entrypoint.go \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
-RUN curl -H "Authorization: Bearer \"$(gcloud auth application-default print-access-token)\"" -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/libpcap-1.8.1.tar.gz \
+RUN curl -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/libpcap-1.8.1.tar.gz \
   && ls -la libpcap-1.8.1.tar.gz \
   # && echo "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e  libpcap-1.8.1.tar.gz" | sha256sum -c - \
   && mkdir /libpcap \

From 7261b25bb50c7ff88f73389a5640fd47456eb8c0 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 15:44:34 -0400
Subject: [PATCH 16/62] Update Makefile.common

---
 Makefile.common | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Makefile.common b/Makefile.common
index 6edb2447..15c481e1 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -16,6 +16,9 @@ DOCKER_MULTIARCH := 1
 endif
 endif
 
+@echo "testing the gcloud storage api"
+@gcloud storage ls gs://ingest-buildkite-ci/sdks
+
 # Requires login at google storage.
 copy-npcap:
 ifeq ($(CI),true)
@@ -24,6 +27,16 @@ else
 	@echo 'Only available if running in the CI'
 endif
 
+# Requires login at google storage.
+copy-sdks:
+ifeq ($(CI),true)
+	# just list them for now
+	@echo "testing the gcloud storage api"
+	@gcloud storage ls gs://ingest-buildkite-ci/sdks
+else
+	@echo 'Only available if running in the CI'
+endif
+
 push:
 	$(MAKE) atomic-push
 

From 6aa8836e311cd6405adf00e53b732981151684c1 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 15:51:47 -0400
Subject: [PATCH 17/62] Update Makefile.common

---
 Makefile.common | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 15c481e1..f772e7d0 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -16,8 +16,8 @@ DOCKER_MULTIARCH := 1
 endif
 endif
 
-@echo "testing the gcloud storage api"
-@gcloud storage ls gs://ingest-buildkite-ci/sdks
+	@echo "testing the gcloud storage api"
+	@gcloud storage ls gs://ingest-buildkite-ci/sdks
 
 # Requires login at google storage.
 copy-npcap:

From e6682704d983835663d76483f82aa2eefd095394 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 15:55:22 -0400
Subject: [PATCH 18/62] Update Makefile.common

---
 Makefile.common | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index f772e7d0..09d4777a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -16,9 +16,6 @@ DOCKER_MULTIARCH := 1
 endif
 endif
 
-	@echo "testing the gcloud storage api"
-	@gcloud storage ls gs://ingest-buildkite-ci/sdks
-
 # Requires login at google storage.
 copy-npcap:
 ifeq ($(CI),true)

From fb60a38801e4b945e289075e06c43bb5886ef79c Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 16:00:40 -0400
Subject: [PATCH 19/62] Update Makefile.common

---
 go/Makefile.common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/Makefile.common b/go/Makefile.common
index 97086237..728a2e5c 100644
--- a/go/Makefile.common
+++ b/go/Makefile.common
@@ -11,7 +11,7 @@ export DEBIAN_VERSION TAG_EXTENSION NPCAP_FILE
 
 DOCKER_CMD := docker build
 
-build: copy-npcap
+build: copy-npcap copy-sdks
 	@echo ">> Building $(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)"
 	@go run $(SELF_DIR)/../template.go -t Dockerfile.tmpl -o Dockerfile
 	@$(DOCKER_CMD) -t "$(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)" \

From 0564024e9c2e3f9d838d9d376832f7f483beafd8 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 16:12:56 -0400
Subject: [PATCH 20/62] Update Makefile.common

---
 Makefile.common | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 09d4777a..4ed35951 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -27,9 +27,9 @@ endif
 # Requires login at google storage.
 copy-sdks:
 ifeq ($(CI),true)
-	# just list them for now
 	@echo "testing the gcloud storage api"
-	@gcloud storage ls gs://ingest-buildkite-ci/sdks
+	@mkdir ../sdks
+	@gcloud storage cp gs://ingest-buildkite-ci/sdks ../sdks
 else
 	@echo 'Only available if running in the CI'
 endif

From 2a3f6bb5866f7ad8120dd21e1dc7f69511b84737 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 16:19:53 -0400
Subject: [PATCH 21/62] Update Makefile.common

---
 Makefile.common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.common b/Makefile.common
index 4ed35951..95777b54 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -29,7 +29,7 @@ copy-sdks:
 ifeq ($(CI),true)
 	@echo "testing the gcloud storage api"
 	@mkdir ../sdks
-	@gcloud storage cp gs://ingest-buildkite-ci/sdks ../sdks
+	@gcloud storage cp gs://ingest-buildkite-ci/sdks ../sdks --recursive
 else
 	@echo 'Only available if running in the CI'
 endif

From a1f7632febf251b2013e8ecd14cba044768c926e Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 16:24:45 -0400
Subject: [PATCH 22/62] Update Makefile.common

---
 Makefile.common | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 95777b54..bec73e3f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -28,8 +28,7 @@ endif
 copy-sdks:
 ifeq ($(CI),true)
 	@echo "testing the gcloud storage api"
-	@mkdir ../sdks
-	@gcloud storage cp gs://ingest-buildkite-ci/sdks ../sdks --recursive
+	@gcloud storage cp gs://ingest-buildkite-ci/sdks ../ --recursive
 else
 	@echo 'Only available if running in the CI'
 endif

From fbac907fd4a81cb20ea2dc22cbed8d7b5721841a Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 16:40:19 -0400
Subject: [PATCH 23/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index ec620d69..f831fcd6 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -61,6 +61,10 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && CGO_ENABLED=0 go build -o /crossbuild /entrypoint.go \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
+COPY sdks/libpcap-1.8.1.tar.gz . \
+  && ls -la libpcap-1.8.1.tar.gz \
+  && rm libpcap-1.8.1.tar.gz
+
 RUN curl -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/libpcap-1.8.1.tar.gz \
   && ls -la libpcap-1.8.1.tar.gz \
   # && echo "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e  libpcap-1.8.1.tar.gz" | sha256sum -c - \

From be3a3b52e0ab5e19b05f03d8eb50c2db0e513d6d Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 16:51:24 -0400
Subject: [PATCH 24/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index f831fcd6..5b7e2d27 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -61,7 +61,8 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && CGO_ENABLED=0 go build -o /crossbuild /entrypoint.go \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
-COPY sdks/libpcap-1.8.1.tar.gz . \
+LS ../sdks/
+COPY ../sdks/libpcap-1.8.1.tar.gz . \
   && ls -la libpcap-1.8.1.tar.gz \
   && rm libpcap-1.8.1.tar.gz
 

From 40ae11f25d3d16289ba8abaf06fb56475b82cd92 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 16:56:49 -0400
Subject: [PATCH 25/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index 5b7e2d27..eb77493b 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -61,7 +61,6 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && CGO_ENABLED=0 go build -o /crossbuild /entrypoint.go \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
-LS ../sdks/
 COPY ../sdks/libpcap-1.8.1.tar.gz . \
   && ls -la libpcap-1.8.1.tar.gz \
   && rm libpcap-1.8.1.tar.gz

From 63aee44a9fe64c7ef9071d6aeb6c888d04a865fd Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 17:04:09 -0400
Subject: [PATCH 26/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index eb77493b..ca841714 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -61,7 +61,8 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && CGO_ENABLED=0 go build -o /crossbuild /entrypoint.go \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
-COPY ../sdks/libpcap-1.8.1.tar.gz . \
+RUN pwd
+COPY ../../sdks/libpcap-1.8.1.tar.gz . \
   && ls -la libpcap-1.8.1.tar.gz \
   && rm libpcap-1.8.1.tar.gz
 

From bd97250f81fd03fa510b9e170ae1f1a920214eeb Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 17:11:47 -0400
Subject: [PATCH 27/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index ca841714..a7e4569f 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -61,10 +61,9 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && CGO_ENABLED=0 go build -o /crossbuild /entrypoint.go \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
-RUN pwd
-COPY ../../sdks/libpcap-1.8.1.tar.gz . \
-  && ls -la libpcap-1.8.1.tar.gz \
-  && rm libpcap-1.8.1.tar.gz
+COPY ../../sdks/libpcap-1.8.1.tar.gz . 
+RUN ls -la libpcap-1.8.1.tar.gz
+RUN rm libpcap-1.8.1.tar.gz
 
 RUN curl -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/libpcap-1.8.1.tar.gz \
   && ls -la libpcap-1.8.1.tar.gz \

From 06e326cff177815a4102dea162f3adf455219c60 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 17:17:41 -0400
Subject: [PATCH 28/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index a7e4569f..931821f1 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -61,7 +61,8 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && CGO_ENABLED=0 go build -o /crossbuild /entrypoint.go \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
-COPY ../../sdks/libpcap-1.8.1.tar.gz . 
+RUN ls
+COPY ../../../sdks/libpcap-1.8.1.tar.gz . 
 RUN ls -la libpcap-1.8.1.tar.gz
 RUN rm libpcap-1.8.1.tar.gz
 

From b2a8317a6781028b9a7762f0cadae702139f22dd Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 17:34:47 -0400
Subject: [PATCH 29/62] Update Makefile.common

---
 Makefile.common | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.common b/Makefile.common
index bec73e3f..3f739c8b 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -28,7 +28,9 @@ endif
 copy-sdks:
 ifeq ($(CI),true)
 	@echo "testing the gcloud storage api"
+	@pwd
 	@gcloud storage cp gs://ingest-buildkite-ci/sdks ../ --recursive
+	@ls -ls ../sdks
 else
 	@echo 'Only available if running in the CI'
 endif

From 96426ca5b0a3eeb96871f6d4a4494d2487b05bc5 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 17:41:08 -0400
Subject: [PATCH 30/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index 931821f1..bcc28eb5 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -61,8 +61,7 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && CGO_ENABLED=0 go build -o /crossbuild /entrypoint.go \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
-RUN ls
-COPY ../../../sdks/libpcap-1.8.1.tar.gz . 
+COPY sdks/libpcap-1.8.1.tar.gz . 
 RUN ls -la libpcap-1.8.1.tar.gz
 RUN rm libpcap-1.8.1.tar.gz
 

From 0fb95b2fe404352880d51866f408da4c7cf9e61d Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 18:10:32 -0400
Subject: [PATCH 31/62] Update Makefile.common

---
 go/Makefile.common | 1 +
 1 file changed, 1 insertion(+)

diff --git a/go/Makefile.common b/go/Makefile.common
index 728a2e5c..a3580ef8 100644
--- a/go/Makefile.common
+++ b/go/Makefile.common
@@ -23,6 +23,7 @@ build: copy-npcap copy-sdks
 	--build-arg VCS_REF="$(VCS_REF)" \
 	--build-arg VCS_URL="$(VCS_URL)" \
 	--build-arg BUILD_DATE="$(BUILD_DATE)" \
+	--progress=plain \
 	.
 
 build-arm:

From 10aa6ecb660346dc2da2875345cb285e02e7ac4e Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 18:14:12 -0400
Subject: [PATCH 32/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index bcc28eb5..ae4e5923 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -61,6 +61,7 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && CGO_ENABLED=0 go build -o /crossbuild /entrypoint.go \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
+RUN pwd
 COPY sdks/libpcap-1.8.1.tar.gz . 
 RUN ls -la libpcap-1.8.1.tar.gz
 RUN rm libpcap-1.8.1.tar.gz

From 359b6b22d0fd310afd7dcc748605b952aabe96f5 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 20 Sep 2024 18:18:16 -0400
Subject: [PATCH 33/62] Update Makefile.common

---
 go/Makefile.common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/Makefile.common b/go/Makefile.common
index a3580ef8..bd1ddfa4 100644
--- a/go/Makefile.common
+++ b/go/Makefile.common
@@ -23,7 +23,7 @@ build: copy-npcap copy-sdks
 	--build-arg VCS_REF="$(VCS_REF)" \
 	--build-arg VCS_URL="$(VCS_URL)" \
 	--build-arg BUILD_DATE="$(BUILD_DATE)" \
-	--progress=plain \
+	--progress=plain --no-cache \
 	.
 
 build-arm:

From 93ad11b467f71766324d14f62727ad9cff12e87e Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:28:24 -0400
Subject: [PATCH 34/62] Update Makefile.common

---
 Makefile.common | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 3f739c8b..4586f602 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -29,8 +29,8 @@ copy-sdks:
 ifeq ($(CI),true)
 	@echo "testing the gcloud storage api"
 	@pwd
-	@gcloud storage cp gs://ingest-buildkite-ci/sdks ../ --recursive
-	@ls -ls ../sdks
+	@gcloud storage cp gs://ingest-buildkite-ci/sdks . --recursive
+	@ls -ls ./sdks
 else
 	@echo 'Only available if running in the CI'
 endif

From b323f1c962ed9103a0263c9841e5aa3ce6691b73 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:35:42 -0400
Subject: [PATCH 35/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index ae4e5923..534ba87b 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -61,17 +61,12 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && CGO_ENABLED=0 go build -o /crossbuild /entrypoint.go \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
-RUN pwd
 COPY sdks/libpcap-1.8.1.tar.gz . 
 RUN ls -la libpcap-1.8.1.tar.gz
-RUN rm libpcap-1.8.1.tar.gz
 
-RUN curl -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/libpcap-1.8.1.tar.gz \
-  && ls -la libpcap-1.8.1.tar.gz \
-  # && echo "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e  libpcap-1.8.1.tar.gz" | sha256sum -c - \
-  && mkdir /libpcap \
-	&& tar -xzf libpcap-1.8.1.tar.gz -C /libpcap \
-  && rm libpcap-1.8.1.tar.gz
+RUN mkdir /libpcap \
+    && tar -xzf libpcap-1.8.1.tar.gz -C /libpcap \
+    && rm libpcap-1.8.1.tar.gz
 
 
 ENV GOLANG_CROSSBUILD=1

From c3d4f5a6d78c9a3fdeb03d8b6f18fb39a058850c Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 08:36:01 -0400
Subject: [PATCH 36/62] Update Dockerfile.tmpl

---
 go/main/Dockerfile.tmpl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/go/main/Dockerfile.tmpl b/go/main/Dockerfile.tmpl
index c5db65b7..036d658a 100644
--- a/go/main/Dockerfile.tmpl
+++ b/go/main/Dockerfile.tmpl
@@ -59,8 +59,10 @@ RUN cd /libpcap/libpcap-1.8.1 \
   && ./configure --enable-usb=no --enable-bluetooth=no --enable-dbus=no \
   && make
 
-RUN curl -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/WpdPack_4_1_2.zip \
-  && mkdir -p /libpcap/win \
+COPY sdks/WpdPack_4_1_2.zip . 
+RUN ls -la WpdPack_4_1_2.zip
+
+RUN mkdir -p /libpcap/win \
   && echo "ea799cf2f26e4afb1892938070fd2b1ca37ce5cf75fec4349247df12b784edbd  WpdPack_4_1_2.zip" | sha256sum -c - \
   && unzip WpdPack_4_1_2.zip -d /libpcap/win \
   && rm WpdPack_4_1_2.zip \

From 39d622f9b0b2481d9ac568f954bb9184a8b62d57 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 09:42:39 -0400
Subject: [PATCH 37/62] Update Dockerfile.tmpl

---
 go/base-arm/Dockerfile.tmpl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/go/base-arm/Dockerfile.tmpl b/go/base-arm/Dockerfile.tmpl
index 75036b6c..7fda19cf 100644
--- a/go/base-arm/Dockerfile.tmpl
+++ b/go/base-arm/Dockerfile.tmpl
@@ -68,9 +68,10 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION-arm \
     && go build -o /crossbuild /entrypoint.go \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
-RUN curl -sSLO https://storage.googleapis.com/ingest-buildkite-ci/sdks/libpcap-1.8.1.tar.gz \
-  && mkdir /libpcap \
-	&& tar -xzf libpcap-1.8.1.tar.gz -C /libpcap \
+COPY sdks/libpcap-1.8.1.tar.gz . 
+RUN ls -la libpcap-1.8.1.tar.gz
+RUN mkdir /libpcap \
+  && tar -xzf libpcap-1.8.1.tar.gz -C /libpcap \
   && cd /libpcap/libpcap-1.8.1 \
   && ./configure --enable-usb=no --enable-bluetooth=no --enable-dbus=no --host=aarch64-unknown-linux-gnu --with-pcap=linux \
   && make

From 455556560dfbf4fe82247d6185773ec4bece07b1 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 09:49:35 -0400
Subject: [PATCH 38/62] Update Dockerfile.tmpl

---
 go/darwin/Dockerfile.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index dcd170b9..76d254f4 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -44,11 +44,12 @@ ARG OSXCROSS_REV=3034f7149716d815bc473d0a7b35d17e4cf175aa
 ARG SDK_VERSION=10.11
 ARG DARWIN_VERSION=15
 ARG OSX_VERSION_MIN=10.10
+COPY sdks/MacOSX10.11.sdk.tar.xz tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz
+RUN ls -la tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz
 RUN \
     mkdir -p /tmp/osxcross && cd /tmp/osxcross \
     && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \
         | tar -C /tmp/osxcross --strip=1 -xzf - \
-    && curl -sSLo "tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz" "${OSXCROSS_SDK_URL}" \
     && UNATTENDED=yes ./build.sh >/dev/null \
     && mv target "${OSXCROSS_PATH}" \
     && rm -rf /tmp/osxcross "/usr/osxcross/SDK/MacOSX${SDK_VERSION}.sdk/usr/share/man"

From f89c3a4fe75a0ea5dbc9f050be0eb62b214f39f0 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 09:51:13 -0400
Subject: [PATCH 39/62] Update Dockerfile.tmpl

---
 go/darwin/Dockerfile.tmpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index 76d254f4..3d30c378 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -38,7 +38,6 @@ COPY --from=build-llvm-apple /osxcross.tar.gz /tmp/osxcross.tar.gz
 RUN tar -xzf /tmp/osxcross.tar.gz -C / \
   && rm /tmp/osxcross.tar.gz
 {{- else }}
-ARG OSXCROSS_SDK_URL=https://storage.googleapis.com/ingest-buildkite-ci/sdks/MacOSX10.11.sdk.tar.xz
 ARG OSXCROSS_PATH=/usr/osxcross
 ARG OSXCROSS_REV=3034f7149716d815bc473d0a7b35d17e4cf175aa
 ARG SDK_VERSION=10.11

From 1d5526e332b565f95aa354fe794f14ab6a5e4652 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 09:54:16 -0400
Subject: [PATCH 40/62] Update Dockerfile.tmpl

---
 go/llvm-apple/Dockerfile.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/go/llvm-apple/Dockerfile.tmpl b/go/llvm-apple/Dockerfile.tmpl
index 942fb98f..8fcfe4b1 100644
--- a/go/llvm-apple/Dockerfile.tmpl
+++ b/go/llvm-apple/Dockerfile.tmpl
@@ -51,8 +51,6 @@ RUN mkdir -p /tmp/llvm-project && cd /tmp/llvm-project \
 ARG OSX_SDK="MacOSX11.3.sdk"
 # Packaging the SDK on macOS https://github.com/tpoechtrager/osxcross#packaging-the-sdk
 # alternative SDK already generated
-#ARG OSXCROSS_SDK_URL=https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/${OSX_SDK}.tar.xz
-ARG OSXCROSS_SDK_URL=https://storage.googleapis.com/ingest-buildkite-ci/sdks/${OSX_SDK}.tar.xz
 ARG OSXCROSS_PATH=/usr/local/osxcross
 ARG OSXCROSS_REV=062922bbb81ac52787d8e53fa4af190acb552ec7
 ARG OSX_VERSION_MIN=10.10
@@ -61,11 +59,13 @@ RUN mkdir -p /tmp/osxcross
 # https://raw.githubusercontent.com/crazy-max/docker-osxcross/main/patches/lcxx.patch
 COPY lcxx.patch /tmp/osxcross/lcxx.patch
 
+COPY sdks/MacOSX10.11.sdk.tar.xz tarballs/${OSX_SDK}.tar.xz
+RUN ls -la tarballs/${OSX_SDK}.tar.xz
+
 RUN \
     cd /tmp/osxcross \
     && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \
         | tar -C /tmp/osxcross --strip=1 -xzf - \
-    && curl -sSLo "tarballs/${OSX_SDK}.tar.xz" "${OSXCROSS_SDK_URL}" \
     && patch -p1 < lcxx.patch \
     && UNATTENDED=1 ENABLE_COMPILER_RT_INSTALL=1 OSX_VERSION_MIN=${OSX_VERSION_MIN} TARGET_DIR=${OSXCROSS_PATH} ./build.sh >/dev/null \
     && rm -rf "/usr/osxcross/SDK/${OSX_SDK}/usr/share/man" \

From e279391eedcc328296a3f73cf7f293c59deda4da Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 10:10:07 -0400
Subject: [PATCH 41/62] Update Makefile.common

---
 go/Makefile.common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/Makefile.common b/go/Makefile.common
index bd1ddfa4..2229d145 100644
--- a/go/Makefile.common
+++ b/go/Makefile.common
@@ -26,7 +26,7 @@ build: copy-npcap copy-sdks
 	--progress=plain --no-cache \
 	.
 
-build-arm:
+build-arm: copy-sdks
 	@echo $(SELF_DIR)
 	@echo ">> Building $(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)"
 	@go run $(SELF_DIR)/../template.go -t Dockerfile.tmpl -o Dockerfile

From 082c4f74e17c6f2c1f6f601318e510de4c22c2e8 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 10:24:55 -0400
Subject: [PATCH 42/62] Update Dockerfile.tmpl

---
 go/darwin/Dockerfile.tmpl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index 3d30c378..4614239b 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -43,13 +43,14 @@ ARG OSXCROSS_REV=3034f7149716d815bc473d0a7b35d17e4cf175aa
 ARG SDK_VERSION=10.11
 ARG DARWIN_VERSION=15
 ARG OSX_VERSION_MIN=10.10
-COPY sdks/MacOSX10.11.sdk.tar.xz tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz
-RUN ls -la tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz
+
 RUN \
     mkdir -p /tmp/osxcross && cd /tmp/osxcross \
     && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \
-        | tar -C /tmp/osxcross --strip=1 -xzf - \
-    && UNATTENDED=yes ./build.sh >/dev/null \
+        | tar -C /tmp/osxcross --strip=1 -xzf -
+COPY sdks/MacOSX10.11.sdk.tar.xz tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz
+RUN \
+    UNATTENDED=yes ./build.sh >/dev/null \
     && mv target "${OSXCROSS_PATH}" \
     && rm -rf /tmp/osxcross "/usr/osxcross/SDK/MacOSX${SDK_VERSION}.sdk/usr/share/man"
 {{- end }}

From c9d26b08401f1fdb7a1c86916502f0d3e2aaeeb1 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 10:37:50 -0400
Subject: [PATCH 43/62] Update Dockerfile.tmpl

---
 go/darwin/Dockerfile.tmpl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index 4614239b..04a0af57 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -47,10 +47,9 @@ ARG OSX_VERSION_MIN=10.10
 RUN \
     mkdir -p /tmp/osxcross && cd /tmp/osxcross \
     && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \
-        | tar -C /tmp/osxcross --strip=1 -xzf -
-COPY sdks/MacOSX10.11.sdk.tar.xz tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz
-RUN \
-    UNATTENDED=yes ./build.sh >/dev/null \
+        | tar -C /tmp/osxcross --strip=1 -xzf - \
+    && cp sdks/MacOSX10.11.sdk.tar.xz tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz
+    && UNATTENDED=yes ./build.sh >/dev/null \
     && mv target "${OSXCROSS_PATH}" \
     && rm -rf /tmp/osxcross "/usr/osxcross/SDK/MacOSX${SDK_VERSION}.sdk/usr/share/man"
 {{- end }}

From f7be9a3617095b6d4275b2d104005d4ad0f412c1 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 10:58:05 -0400
Subject: [PATCH 44/62] Update Dockerfile.tmpl

---
 go/darwin/Dockerfile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index 04a0af57..cfedd5f5 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -48,7 +48,7 @@ RUN \
     mkdir -p /tmp/osxcross && cd /tmp/osxcross \
     && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \
         | tar -C /tmp/osxcross --strip=1 -xzf - \
-    && cp sdks/MacOSX10.11.sdk.tar.xz tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz
+    && cp sdks/MacOSX10.11.sdk.tar.xz tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz \
     && UNATTENDED=yes ./build.sh >/dev/null \
     && mv target "${OSXCROSS_PATH}" \
     && rm -rf /tmp/osxcross "/usr/osxcross/SDK/MacOSX${SDK_VERSION}.sdk/usr/share/man"

From 0e07dc937b6a33525a93ab848f13383c037ab237 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 11:10:23 -0400
Subject: [PATCH 45/62] Update Dockerfile.tmpl

---
 go/darwin/Dockerfile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index cfedd5f5..d8c35deb 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -48,7 +48,7 @@ RUN \
     mkdir -p /tmp/osxcross && cd /tmp/osxcross \
     && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \
         | tar -C /tmp/osxcross --strip=1 -xzf - \
-    && cp sdks/MacOSX10.11.sdk.tar.xz tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz \
+    && cp /sdks/MacOSX10.11.sdk.tar.xz tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz \
     && UNATTENDED=yes ./build.sh >/dev/null \
     && mv target "${OSXCROSS_PATH}" \
     && rm -rf /tmp/osxcross "/usr/osxcross/SDK/MacOSX${SDK_VERSION}.sdk/usr/share/man"

From 04a68f9dd8d3f5b6b9bb14820cc7ab581412a5f7 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 11:50:39 -0400
Subject: [PATCH 46/62] Update Dockerfile.tmpl

---
 go/darwin/Dockerfile.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index d8c35deb..e0b4e6dd 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -44,6 +44,7 @@ ARG SDK_VERSION=10.11
 ARG DARWIN_VERSION=15
 ARG OSX_VERSION_MIN=10.10
 
+RUN find / -type f -name '*.tar.*'
 RUN \
     mkdir -p /tmp/osxcross && cd /tmp/osxcross \
     && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \

From 5a841fd0b0030b4daf051cde9d74b48dfc9a33a7 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 12:34:15 -0400
Subject: [PATCH 47/62] Update Dockerfile.tmpl

---
 go/main/Dockerfile.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/go/main/Dockerfile.tmpl b/go/main/Dockerfile.tmpl
index 036d658a..0bf07cec 100644
--- a/go/main/Dockerfile.tmpl
+++ b/go/main/Dockerfile.tmpl
@@ -59,6 +59,7 @@ RUN cd /libpcap/libpcap-1.8.1 \
   && ./configure --enable-usb=no --enable-bluetooth=no --enable-dbus=no \
   && make
 
+RUN find / -type f -name '*.tar.*'
 COPY sdks/WpdPack_4_1_2.zip . 
 RUN ls -la WpdPack_4_1_2.zip
 

From 1f26f78234da030463d506c76fe1091bc0f60682 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 13:01:24 -0400
Subject: [PATCH 48/62] Update Makefile.common

---
 Makefile.common | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.common b/Makefile.common
index 4586f602..25e5aa45 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -30,7 +30,8 @@ ifeq ($(CI),true)
 	@echo "testing the gcloud storage api"
 	@pwd
 	@gcloud storage cp gs://ingest-buildkite-ci/sdks . --recursive
-	@ls -ls ./sdks
+	@ls -la ./sdks
+	@find / -type f -name '*.tar.*'
 else
 	@echo 'Only available if running in the CI'
 endif

From 807408345183aa8124c1ca2469699c72cf907640 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 13:10:29 -0400
Subject: [PATCH 49/62] Update Makefile.common

---
 Makefile.common | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 25e5aa45..75c2e31f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -30,8 +30,6 @@ ifeq ($(CI),true)
 	@echo "testing the gcloud storage api"
 	@pwd
 	@gcloud storage cp gs://ingest-buildkite-ci/sdks . --recursive
-	@ls -la ./sdks
-	@find / -type f -name '*.tar.*'
 else
 	@echo 'Only available if running in the CI'
 endif

From 52afa6230ccbd0ff9b3d3137fb874a006d81f6f3 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 14:55:35 -0400
Subject: [PATCH 50/62] Update Dockerfile.tmpl

---
 go/darwin/Dockerfile.tmpl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index e0b4e6dd..42c17c48 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -44,12 +44,15 @@ ARG SDK_VERSION=10.11
 ARG DARWIN_VERSION=15
 ARG OSX_VERSION_MIN=10.10
 
+# does the COPY cmd work when cp doesn't?
+COPY sdks/MacOSX10.11.sdk.tar.xz .
+RUN ls -l MacOSX10.11.sdk.tar.xz
 RUN find / -type f -name '*.tar.*'
 RUN \
     mkdir -p /tmp/osxcross && cd /tmp/osxcross \
     && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \
         | tar -C /tmp/osxcross --strip=1 -xzf - \
-    && cp /sdks/MacOSX10.11.sdk.tar.xz tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz \
+    && cp sdks/MacOSX10.11.sdk.tar.xz tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz \
     && UNATTENDED=yes ./build.sh >/dev/null \
     && mv target "${OSXCROSS_PATH}" \
     && rm -rf /tmp/osxcross "/usr/osxcross/SDK/MacOSX${SDK_VERSION}.sdk/usr/share/man"

From eb05571d81af1f4beb04a02fbf9ed68c1059abf2 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 15:41:44 -0400
Subject: [PATCH 51/62] Update Dockerfile.tmpl

---
 go/darwin/Dockerfile.tmpl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index 42c17c48..1554dc95 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -45,14 +45,13 @@ ARG DARWIN_VERSION=15
 ARG OSX_VERSION_MIN=10.10
 
 # does the COPY cmd work when cp doesn't?
-COPY sdks/MacOSX10.11.sdk.tar.xz .
-RUN ls -l MacOSX10.11.sdk.tar.xz
+COPY sdks/MacOSX10.11.sdk.tar.xz .    # copies from darwin to /app workdir
 RUN find / -type f -name '*.tar.*'
 RUN \
     mkdir -p /tmp/osxcross && cd /tmp/osxcross \
     && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \
         | tar -C /tmp/osxcross --strip=1 -xzf - \
-    && cp sdks/MacOSX10.11.sdk.tar.xz tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz \
+    && cp /app/MacOSX10.11.sdk.tar.xz tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz \
     && UNATTENDED=yes ./build.sh >/dev/null \
     && mv target "${OSXCROSS_PATH}" \
     && rm -rf /tmp/osxcross "/usr/osxcross/SDK/MacOSX${SDK_VERSION}.sdk/usr/share/man"

From 4901395e371df88a87aadc3eb23465e5fd5f8078 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 15:49:37 -0400
Subject: [PATCH 52/62] Update Dockerfile.tmpl

---
 go/darwin/Dockerfile.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index 1554dc95..b969d559 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -45,7 +45,8 @@ ARG DARWIN_VERSION=15
 ARG OSX_VERSION_MIN=10.10
 
 # does the COPY cmd work when cp doesn't?
-COPY sdks/MacOSX10.11.sdk.tar.xz .    # copies from darwin to /app workdir
+# copies from darwin to /app workdir
+COPY sdks/MacOSX10.11.sdk.tar.xz .    
 RUN find / -type f -name '*.tar.*'
 RUN \
     mkdir -p /tmp/osxcross && cd /tmp/osxcross \

From c4447821616161837bbcc60873a6fcdd773332a4 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 17:56:20 -0400
Subject: [PATCH 53/62] Update Makefile.common

---
 Makefile.common | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 75c2e31f..cf231fc1 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -27,8 +27,6 @@ endif
 # Requires login at google storage.
 copy-sdks:
 ifeq ($(CI),true)
-	@echo "testing the gcloud storage api"
-	@pwd
 	@gcloud storage cp gs://ingest-buildkite-ci/sdks . --recursive
 else
 	@echo 'Only available if running in the CI'

From 6ab14a76bced4f966fa94efe290baee422f95a03 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 17:57:04 -0400
Subject: [PATCH 54/62] Update Dockerfile.tmpl

---
 go/base-arm/Dockerfile.tmpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/go/base-arm/Dockerfile.tmpl b/go/base-arm/Dockerfile.tmpl
index 7fda19cf..3d689005 100644
--- a/go/base-arm/Dockerfile.tmpl
+++ b/go/base-arm/Dockerfile.tmpl
@@ -69,7 +69,6 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION-arm \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
 COPY sdks/libpcap-1.8.1.tar.gz . 
-RUN ls -la libpcap-1.8.1.tar.gz
 RUN mkdir /libpcap \
   && tar -xzf libpcap-1.8.1.tar.gz -C /libpcap \
   && cd /libpcap/libpcap-1.8.1 \

From 9543fe86f4ca0a04333d4396e2e99ea78d2e2e57 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 17:57:48 -0400
Subject: [PATCH 55/62] Update Dockerfile.tmpl

---
 go/base/Dockerfile.tmpl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index 534ba87b..f06de35b 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -62,8 +62,6 @@ RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
     && rm -rf /go/* /root/.cache/* /entrypoint.go
 
 COPY sdks/libpcap-1.8.1.tar.gz . 
-RUN ls -la libpcap-1.8.1.tar.gz
-
 RUN mkdir /libpcap \
     && tar -xzf libpcap-1.8.1.tar.gz -C /libpcap \
     && rm libpcap-1.8.1.tar.gz

From 0211f1640e7eabc887beea4f8392d0fad1695496 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 17:58:29 -0400
Subject: [PATCH 56/62] Update Dockerfile.tmpl

---
 go/darwin/Dockerfile.tmpl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index b969d559..ed7ff4bb 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -44,10 +44,7 @@ ARG SDK_VERSION=10.11
 ARG DARWIN_VERSION=15
 ARG OSX_VERSION_MIN=10.10
 
-# does the COPY cmd work when cp doesn't?
-# copies from darwin to /app workdir
 COPY sdks/MacOSX10.11.sdk.tar.xz .    
-RUN find / -type f -name '*.tar.*'
 RUN \
     mkdir -p /tmp/osxcross && cd /tmp/osxcross \
     && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \

From f7bed96709bc43a4a8a0dfb80d9ec0faba67713a Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 17:58:58 -0400
Subject: [PATCH 57/62] Update Dockerfile.tmpl

---
 go/llvm-apple/Dockerfile.tmpl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/go/llvm-apple/Dockerfile.tmpl b/go/llvm-apple/Dockerfile.tmpl
index 8fcfe4b1..9087fe19 100644
--- a/go/llvm-apple/Dockerfile.tmpl
+++ b/go/llvm-apple/Dockerfile.tmpl
@@ -60,8 +60,6 @@ RUN mkdir -p /tmp/osxcross
 COPY lcxx.patch /tmp/osxcross/lcxx.patch
 
 COPY sdks/MacOSX10.11.sdk.tar.xz tarballs/${OSX_SDK}.tar.xz
-RUN ls -la tarballs/${OSX_SDK}.tar.xz
-
 RUN \
     cd /tmp/osxcross \
     && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \

From f216c7c904c03f59fe2b88106d72f2a85a85535b Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 17:59:59 -0400
Subject: [PATCH 58/62] Update Dockerfile.tmpl

---
 go/main/Dockerfile.tmpl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/go/main/Dockerfile.tmpl b/go/main/Dockerfile.tmpl
index 0bf07cec..3cda882b 100644
--- a/go/main/Dockerfile.tmpl
+++ b/go/main/Dockerfile.tmpl
@@ -59,10 +59,7 @@ RUN cd /libpcap/libpcap-1.8.1 \
   && ./configure --enable-usb=no --enable-bluetooth=no --enable-dbus=no \
   && make
 
-RUN find / -type f -name '*.tar.*'
 COPY sdks/WpdPack_4_1_2.zip . 
-RUN ls -la WpdPack_4_1_2.zip
-
 RUN mkdir -p /libpcap/win \
   && echo "ea799cf2f26e4afb1892938070fd2b1ca37ce5cf75fec4349247df12b784edbd  WpdPack_4_1_2.zip" | sha256sum -c - \
   && unzip WpdPack_4_1_2.zip -d /libpcap/win \

From e2fd8e2efe0aa07c18a51aa3dbcba22d1d13b4d8 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Fri, 27 Sep 2024 18:00:36 -0400
Subject: [PATCH 59/62] Update Makefile.common

---
 go/Makefile.common | 1 -
 1 file changed, 1 deletion(-)

diff --git a/go/Makefile.common b/go/Makefile.common
index 2229d145..0d4ced6c 100644
--- a/go/Makefile.common
+++ b/go/Makefile.common
@@ -23,7 +23,6 @@ build: copy-npcap copy-sdks
 	--build-arg VCS_REF="$(VCS_REF)" \
 	--build-arg VCS_URL="$(VCS_URL)" \
 	--build-arg BUILD_DATE="$(BUILD_DATE)" \
-	--progress=plain --no-cache \
 	.
 
 build-arm: copy-sdks

From 6b2b78d59d0ca7a0284ce986cc1325c9bf608a3d Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Mon, 30 Sep 2024 09:31:39 -0400
Subject: [PATCH 60/62] Update Dockerfile.tmpl

---
 go/darwin/Dockerfile.tmpl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index ed7ff4bb..b380df88 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -44,12 +44,11 @@ ARG SDK_VERSION=10.11
 ARG DARWIN_VERSION=15
 ARG OSX_VERSION_MIN=10.10
 
-COPY sdks/MacOSX10.11.sdk.tar.xz .    
+COPY sdks/MacOSX10.11.sdk.tar.xz /tmp/osxcross/tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz
 RUN \
-    mkdir -p /tmp/osxcross && cd /tmp/osxcross \
+    cd /tmp/osxcross \
     && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \
         | tar -C /tmp/osxcross --strip=1 -xzf - \
-    && cp /app/MacOSX10.11.sdk.tar.xz tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz \
     && UNATTENDED=yes ./build.sh >/dev/null \
     && mv target "${OSXCROSS_PATH}" \
     && rm -rf /tmp/osxcross "/usr/osxcross/SDK/MacOSX${SDK_VERSION}.sdk/usr/share/man"

From d2c940f8a204838766eb073ffd5ca422e4361df2 Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:16:36 -0400
Subject: [PATCH 61/62] Update Dockerfile.tmpl - use OSX_SDK

---
 go/llvm-apple/Dockerfile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/llvm-apple/Dockerfile.tmpl b/go/llvm-apple/Dockerfile.tmpl
index 9087fe19..a015a5e1 100644
--- a/go/llvm-apple/Dockerfile.tmpl
+++ b/go/llvm-apple/Dockerfile.tmpl
@@ -59,7 +59,7 @@ RUN mkdir -p /tmp/osxcross
 # https://raw.githubusercontent.com/crazy-max/docker-osxcross/main/patches/lcxx.patch
 COPY lcxx.patch /tmp/osxcross/lcxx.patch
 
-COPY sdks/MacOSX10.11.sdk.tar.xz tarballs/${OSX_SDK}.tar.xz
+COPY sdks/${OSX_SDK}.tar.xz tarballs/${OSX_SDK}.tar.xz
 RUN \
     cd /tmp/osxcross \
     && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \

From 46617a2d4e167d2b4b45a5bbdb1dc8f10f97c95f Mon Sep 17 00:00:00 2001
From: Geoff Rowland <70981735+rowlandgeoff@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:17:47 -0400
Subject: [PATCH 62/62] Update go/darwin/Dockerfile.tmpl

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
---
 go/darwin/Dockerfile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index b380df88..143579f5 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -44,7 +44,7 @@ ARG SDK_VERSION=10.11
 ARG DARWIN_VERSION=15
 ARG OSX_VERSION_MIN=10.10
 
-COPY sdks/MacOSX10.11.sdk.tar.xz /tmp/osxcross/tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz
+COPY sdks/MacOSX${SDK_VERSION}.sdk.tar.xz /tmp/osxcross/tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz
 RUN \
     cd /tmp/osxcross \
     && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \