Skip to content

Commit e950251

Browse files
tucksauntrevorwhitney
tucksaun
and
trevorwhitney
authored
feat: build the Docker Driver for arm64 (#9247)
Co-authored-by: Trevor Whitney <trevorjwhitney@gmail.com>
1 parent 8ce321e commit e950251

File tree

10 files changed

+412
-10
lines changed

10 files changed

+412
-10
lines changed

‎.github/jsonnetfile.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"subdir": "workflows"
99
}
1010
},
11-
"version": "20aac53fcb06d378b1c1101c7e4dc989466eb4ff"
11+
"version": "21f1189544e3976070cbdb6463f64c7a32dcc176"
1212
}
1313
],
1414
"legacyImports": true

‎.github/jsonnetfile.lock.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"subdir": "workflows"
99
}
1010
},
11-
"version": "20aac53fcb06d378b1c1101c7e4dc989466eb4ff",
12-
"sum": "bo355Fm9Gm1TU13MjlXGXgrCXo4CPr7aEeTvgNFYAl8="
11+
"version": "21f1189544e3976070cbdb6463f64c7a32dcc176",
12+
"sum": "IPS1oGR8k7jk6J2snciTycWFgtISCwXSPhJ3A+nEGvY="
1313
}
1414
],
1515
"legacyImports": false

‎.github/release-workflows.jsonnet

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ local imageJobs = {
1515
'loki-canary-boringcrypto': build.image('loki-canary-boringcrypto', 'cmd/loki-canary-boringcrypto'),
1616
promtail: build.image('promtail', 'clients/cmd/promtail'),
1717
querytee: build.image('loki-query-tee', 'cmd/querytee', platform=['linux/amd64']),
18+
'loki-docker-driver': build.dockerPlugin('grafana/loki-docker-driver', 'clients/cmd/docker-driver', platform=['linux/amd64', 'linux/arm64']),
1819
};
1920

2021
local weeklyImageJobs = {
@@ -27,6 +28,7 @@ local weeklyImageJobs = {
2728
'loki-canary-boringcrypto': build.weeklyImage('loki-canary-boringcrypto', 'cmd/loki-canary-boringcrypto'),
2829
promtail: build.weeklyImage('promtail', 'clients/cmd/promtail'),
2930
querytee: build.weeklyImage('loki-query-tee', 'cmd/querytee', platform=['linux/amd64']),
31+
'loki-docker-driver': build.weeklyDockerPlugin('grafana/loki-docker-driver', 'clients/cmd/docker-driver', platform=['linux/amd64', 'linux/arm64']),
3032
};
3133

3234
local buildImageVersion = std.extVar('BUILD_IMAGE_VERSION');

‎.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet

+146
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/images.yml

+72
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,78 @@
329329
"platforms": "linux/amd64,linux/arm64,linux/arm"
330330
"push": true
331331
"tags": "${{ env.IMAGE_PREFIX }}/loki-canary-boringcrypto:${{ steps.weekly-version.outputs.version }}"
332+
"loki-docker-driver":
333+
"env":
334+
"BUILD_TIMEOUT": 60
335+
"IMAGE_PREFIX": "grafana"
336+
"RELEASE_LIB_REF": "main"
337+
"RELEASE_REPO": "grafana/loki"
338+
"needs":
339+
- "check"
340+
"runs-on": "ubuntu-latest"
341+
"steps":
342+
- "name": "pull release library code"
343+
"uses": "actions/checkout@v4"
344+
"with":
345+
"path": "lib"
346+
"ref": "${{ env.RELEASE_LIB_REF }}"
347+
"repository": "grafana/loki-release"
348+
- "name": "pull code to release"
349+
"uses": "actions/checkout@v4"
350+
"with":
351+
"path": "release"
352+
"repository": "${{ env.RELEASE_REPO }}"
353+
- "name": "setup node"
354+
"uses": "actions/setup-node@v4"
355+
"with":
356+
"node-version": 20
357+
- "name": "Set up QEMU"
358+
"uses": "docker/setup-qemu-action@v3"
359+
- "name": "set up docker buildx"
360+
"uses": "docker/setup-buildx-action@v3"
361+
- "name": "Login to DockerHub (from vault)"
362+
"uses": "grafana/shared-workflows/actions/dockerhub-login@main"
363+
- "id": "weekly-version"
364+
"name": "Get weekly version"
365+
"run": |
366+
echo "version=$(./tools/image-tag)" >> $GITHUB_OUTPUT
367+
368+
platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
369+
echo "platform=${platform}" >> $GITHUB_OUTPUT
370+
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
371+
if [[ "${platform}" == "linux/arm64" ]]; then
372+
echo "plugin_arch=-arm64" >> $GITHUB_OUTPUT
373+
else
374+
echo "plugin_arch=" >> $GITHUB_OUTPUT
375+
fi
376+
"working-directory": "release"
377+
- "name": "Build and export"
378+
"timeout-minutes": "${{ fromJSON(env.BUILD_TIMEOUT) }}"
379+
"uses": "docker/build-push-action@v6"
380+
"with":
381+
"build-args": "IMAGE_TAG=${{ steps.weekly-version.outputs.version }},GOARCH=${{ steps.weekly-version.outputs.platform_short }}"
382+
"context": "release"
383+
"file": "release/clients/cmd/docker-driver/Dockerfile"
384+
"outputs": "type=docker,dest=release/images/grafana/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}.tar"
385+
"platforms": "${{ matrix.platform }}"
386+
"push": false
387+
"tags": "${{ env.IMAGE_PREFIX }}/grafana/loki-docker-driver:${{ steps.weekly-version.outputs.version }}"
388+
- "env":
389+
"BUILD_DIR": "release/clients/cmd/docker-driver"
390+
"IMAGE_TAG": "${{ steps.weekly-version.outputs.version }}"
391+
"name": "Package and push as Docker plugin"
392+
"run": |
393+
rm -rf "${{ env.BUILD_DIR }}/rootfs" || true
394+
mkdir "${{ env.BUILD_DIR }}/rootfs"
395+
tar -x -C "${{ env.BUILD_DIR }}/rootfs" -f "release/images/%s-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}.tar"
396+
docker plugin create "${{ env.IMAGE_TAG }}${{ steps.platform.outputs.plugin_arch }}" "${{ env.BUILD_DIR }}"
397+
docker plugin push "${{ env.IMAGE_TAG }}${{ steps.platform.outputs.plugin_arch }}"
398+
"working-directory": "release"
399+
"strategy":
400+
"matrix":
401+
"platform":
402+
- "linux/amd64"
403+
- "linux/arm64"
332404
"promtail":
333405
"env":
334406
"BUILD_TIMEOUT": 60

‎.github/workflows/minor-release-pr.yml

+81
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
- "loki"
3232
- "loki-canary"
3333
- "loki-canary-boringcrypto"
34+
- "loki-docker-driver"
3435
- "promtail"
3536
- "querytee"
3637
runs-on: "ubuntu-latest"
@@ -598,6 +599,86 @@ jobs:
598599
- "linux/amd64"
599600
- "linux/arm64"
600601
- "linux/arm"
602+
loki-docker-driver:
603+
needs:
604+
- "version"
605+
runs-on: "ubuntu-latest"
606+
steps:
607+
- name: "pull release library code"
608+
uses: "actions/checkout@v4"
609+
with:
610+
path: "lib"
611+
ref: "${{ env.RELEASE_LIB_REF }}"
612+
repository: "grafana/loki-release"
613+
- name: "pull code to release"
614+
uses: "actions/checkout@v4"
615+
with:
616+
path: "release"
617+
repository: "${{ env.RELEASE_REPO }}"
618+
- name: "setup node"
619+
uses: "actions/setup-node@v4"
620+
with:
621+
node-version: 20
622+
- name: "auth gcs"
623+
uses: "google-github-actions/auth@v2"
624+
with:
625+
credentials_json: "${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}"
626+
- name: "Set up QEMU"
627+
uses: "docker/setup-qemu-action@v3"
628+
- name: "set up docker buildx"
629+
uses: "docker/setup-buildx-action@v3"
630+
- id: "platform"
631+
name: "parse image platform"
632+
run: |
633+
mkdir -p images
634+
635+
platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
636+
echo "platform=${platform}" >> $GITHUB_OUTPUT
637+
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
638+
if [[ "${platform}" == "linux/arm64" ]]; then
639+
echo "plugin_arch=-arm64" >> $GITHUB_OUTPUT
640+
else
641+
echo "plugin_arch=" >> $GITHUB_OUTPUT
642+
fi
643+
working-directory: "release"
644+
- env:
645+
IMAGE_TAG: "${{ needs.version.outputs.version }}"
646+
if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
647+
name: "Build and export"
648+
timeout-minutes: "${{ fromJSON(env.BUILD_TIMEOUT) }}"
649+
uses: "docker/build-push-action@v6"
650+
with:
651+
build-args: "IMAGE_TAG=${{ needs.version.outputs.version }},GOARCH=${{ steps.platform.outputs.platform_short }}"
652+
context: "release"
653+
file: "release/clients/cmd/docker-driver/Dockerfile"
654+
outputs: "type=docker,dest=release/images/grafana/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}.tar"
655+
platforms: "${{ matrix.platform }}"
656+
push: false
657+
tags: "${{ env.IMAGE_PREFIX }}/grafana/loki-docker-driver:${{ needs.version.outputs.version }}-${{ steps.platform.outputs.platform_short }}"
658+
- env:
659+
BUILD_DIR: "release/clients/cmd/docker-driver"
660+
IMAGE_TAG: "${{ needs.version.outputs.version }}"
661+
if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
662+
name: "Package as Docker plugin"
663+
run: |
664+
rm -rf "${{ env.BUILD_DIR }}/rootfs" || true
665+
mkdir "${{ env.BUILD_DIR }}/rootfs"
666+
tar -x -C "${{ env.BUILD_DIR }}/rootfs" -f "release/images/%s-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}.tar"
667+
docker plugin create "${{ env.IMAGE_TAG }}${{ steps.platform.outputs.plugin_arch }}" "${{ env.BUILD_DIR }}"
668+
working-directory: "release"
669+
- if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
670+
name: "upload artifacts"
671+
uses: "google-github-actions/upload-cloud-storage@v2"
672+
with:
673+
destination: "${{ env.BUILD_ARTIFACTS_BUCKET }}/${{ github.sha }}/images"
674+
path: "release/images/grafana/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}.tar"
675+
process_gcloudignore: false
676+
strategy:
677+
fail-fast: true
678+
matrix:
679+
platform:
680+
- "linux/amd64"
681+
- "linux/arm64"
601682
promtail:
602683
needs:
603684
- "version"

0 commit comments

Comments
 (0)