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
8 changes: 5 additions & 3 deletions .buildkite/pipelines/build_pr_and_deploy_cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@ steps:
provider: gcp
image: family/kibana-ubuntu-2404
imageProject: elastic-images-prod
machineType: n2-standard-8
preemptible: true
diskSizeGb: 125
machineType: c4d-standard-16
diskType: hyperdisk-balanced
zones: us-central1-a,us-central1-b,us-central1-c
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
timeout_in_minutes: 90
key: build
Expand All @@ -76,8 +77,9 @@ steps:
provider: gcp
image: family/kibana-ubuntu-2404
imageProject: elastic-images-prod
machineType: n2-standard-2
machineType: c2-standard-16
preemptible: true
diskSizeGb: 150
timeout_in_minutes: 30
depends_on: build
retry:
Expand Down
2 changes: 1 addition & 1 deletion src/dev/build/tasks/os_packages/docker_generator/run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export async function runDockerGenerator(
*/
if (flags.baseImage === 'wolfi')
baseImageName =
'docker.elastic.co/wolfi/chainguard-base:latest@sha256:568df5fb0e237c3a2139399d4bd8e80994f24321fa8469aec565b8566704e83a';
'docker.elastic.co/wolfi/chainguard-base:latest@sha256:b2134dbfbcfb987eec9c249fc81111963de596ff76098775c2444a2869401d9c';

let imageFlavor = '';
if (flags.baseImage === 'ubi') imageFlavor += `-ubi`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
rm -rf /var/lib/apt/lists/*
{{/ubuntu}}
{{#wolfi}}
# TODO: Remove pinned shadow version once Wolfi image is updated. Newer releases of shadow require glibc 2.43 which is not available in the current image SHA.
RUN apk --no-cache add bash curl fontconfig font-liberation libstdc++ libnss findutils shadow=4.19.3-r0 ca-certificates
# Wolfi updated glibc from 2.42 to 2.43, which changed memory allocation behavior. This flag disables the new behavior.
ENV GLIBC_TUNABLES=glibc.malloc.hugetlb=0

RUN for iter in 1 2 3 4 5; do \
apk --no-cache add bash curl fontconfig font-liberation libstdc++ libnss findutils shadow ca-certificates{{#serverless}} libjemalloc2 mimalloc2{{/serverless}} && break; \
echo "apk add failed (attempt $iter/5), retrying in $((iter * 10))s..."; \
sleep $((iter * 10)); \
[ $iter -eq 5 ] && exit 1; \
done
{{/wolfi}}

# Bring in Kibana from the initial stage.
Expand Down
Loading