From cc877573231c3652047a635e60a2525c615ebb77 Mon Sep 17 00:00:00 2001 From: Navarone Feekery <13634519+navarone-feekery@users.noreply.github.com> Date: Thu, 6 Feb 2025 15:03:45 +0100 Subject: [PATCH 1/5] Add libcurl to installed libs --- Dockerfile.wolfi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.wolfi b/Dockerfile.wolfi index fa7b4ee..0f8d584 100644 --- a/Dockerfile.wolfi +++ b/Dockerfile.wolfi @@ -6,7 +6,7 @@ USER root # we need curl and make below, but then we remove them later # TODO maybe we can do multi-stage to reduce layers in the final image -RUN apk update && apk add --no-cache curl make +RUN apk update && apk add --no-cache curl make curl-dev # ------------------------------------------------------------------------------ # jruby install steps below have been adapted from: From efabd73906f5bebb41464436618681a36ddb5d83 Mon Sep 17 00:00:00 2001 From: Navarone Feekery <13634519+navarone-feekery@users.noreply.github.com> Date: Thu, 6 Feb 2025 15:10:48 +0100 Subject: [PATCH 2/5] REVERT ME remove branch restrictions --- .buildkite/release-pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/release-pipeline.yml b/.buildkite/release-pipeline.yml index ef5a308..08c575d 100644 --- a/.buildkite/release-pipeline.yml +++ b/.buildkite/release-pipeline.yml @@ -17,7 +17,7 @@ steps: # ---- - group: ":package: amd64 Build and Test" key: "build_and_test_amd64" - if: "build.branch =~ /^[0-9]+\\.[0-9x]+.*/" +# if: "build.branch =~ /^[0-9]+\\.[0-9x]+.*/" steps: - label: "Building amd64 Docker image" agents: @@ -48,7 +48,7 @@ steps: # ---- - group: ":package: arm64 Build and Test" key: "build_and_test_arm64" - if: "build.branch =~ /^[0-9]+\\.[0-9x]+.*/" +# if: "build.branch =~ /^[0-9]+\\.[0-9x]+.*/" steps: - label: "Building arm64 Docker image" agents: From 268adc2a1c6c601fa143296ec663a4143911bb6f Mon Sep 17 00:00:00 2001 From: Navarone Feekery <13634519+navarone-feekery@users.noreply.github.com> Date: Thu, 6 Feb 2025 15:29:30 +0100 Subject: [PATCH 3/5] Pin curl to 8.11.1 and remove old Dockerfile --- .buildkite/Dockerfile | 6 ------ .buildkite/publish/publish-common.sh | 2 +- Dockerfile.wolfi | 3 +-- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 .buildkite/Dockerfile diff --git a/.buildkite/Dockerfile b/.buildkite/Dockerfile deleted file mode 100644 index b293633..0000000 --- a/.buildkite/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM jruby:9.4.8.0-jdk21@sha256:1bd52573fb0e9f5dda74a41e0becd9fe6c83517867feff87e5aff92bc82bdcf5 -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - libicu-dev netbase make - -ENTRYPOINT [ "/bin/bash" ] diff --git a/.buildkite/publish/publish-common.sh b/.buildkite/publish/publish-common.sh index 7ae07a8..cc47189 100755 --- a/.buildkite/publish/publish-common.sh +++ b/.buildkite/publish/publish-common.sh @@ -27,7 +27,7 @@ if [[ "${IS_SNAPSHOT:-}" == "true" ]]; then fi export BASE_TAG_NAME="${DOCKER_IMAGE_NAME:-docker.elastic.co/integrations/crawler}" -export DOCKERFILE_PATH="${DOCKERFILE_PATH:-Dockerfile}" +export DOCKERFILE_PATH="${DOCKERFILE_PATH:-Dockerfile.wolfi}" export DOCKER_ARTIFACT_KEY="${DOCKER_ARTIFACT_KEY:-elastic-crawler-docker}" export VAULT_ADDR="${VAULT_ADDR:-https://vault-ci-prod.elastic.dev}" diff --git a/Dockerfile.wolfi b/Dockerfile.wolfi index 0f8d584..a0ac2ae 100644 --- a/Dockerfile.wolfi +++ b/Dockerfile.wolfi @@ -5,8 +5,7 @@ USER root # ------------------------------------------------------------------------------ # we need curl and make below, but then we remove them later # TODO maybe we can do multi-stage to reduce layers in the final image - -RUN apk update && apk add --no-cache curl make curl-dev +RUN apk update && apk add --no-cache curl=8.11.1-r0 make # ------------------------------------------------------------------------------ # jruby install steps below have been adapted from: From 1146b7793ed0532c2ccaa3e9b0bb5fc795cfadc0 Mon Sep 17 00:00:00 2001 From: Navarone Feekery <13634519+navarone-feekery@users.noreply.github.com> Date: Thu, 6 Feb 2025 15:42:04 +0100 Subject: [PATCH 4/5] Update CI docker build location --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9536888..4eda913 100644 --- a/Makefile +++ b/Makefile @@ -31,4 +31,4 @@ notice: script/licenses/generate_notice.rb build-docker-ci: - docker build -t crawler-ci .buildkite + docker build -t crawler-ci . From 2d973ef7da20817cac927597e8dec04fa4cd854d Mon Sep 17 00:00:00 2001 From: Navarone Feekery <13634519+navarone-feekery@users.noreply.github.com> Date: Thu, 6 Feb 2025 15:55:20 +0100 Subject: [PATCH 5/5] Revert "REVERT ME remove branch restrictions" This reverts commit efabd73906f5bebb41464436618681a36ddb5d83. --- .buildkite/release-pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/release-pipeline.yml b/.buildkite/release-pipeline.yml index 08c575d..ef5a308 100644 --- a/.buildkite/release-pipeline.yml +++ b/.buildkite/release-pipeline.yml @@ -17,7 +17,7 @@ steps: # ---- - group: ":package: amd64 Build and Test" key: "build_and_test_amd64" -# if: "build.branch =~ /^[0-9]+\\.[0-9x]+.*/" + if: "build.branch =~ /^[0-9]+\\.[0-9x]+.*/" steps: - label: "Building amd64 Docker image" agents: @@ -48,7 +48,7 @@ steps: # ---- - group: ":package: arm64 Build and Test" key: "build_and_test_arm64" -# if: "build.branch =~ /^[0-9]+\\.[0-9x]+.*/" + if: "build.branch =~ /^[0-9]+\\.[0-9x]+.*/" steps: - label: "Building arm64 Docker image" agents: