Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: build docker plugin on native runners #185

Merged
merged 1 commit into from
Jan 28, 2025
Merged

feat: build docker plugin on native runners #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions .github/workflows/release-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ jobs:
loki-docker-driver:
needs:
- "version"
runs-on: "ubuntu-latest"
runs-on: "${{ matrix.runs_on }}"
steps:
- name: "pull release library code"
uses: "actions/checkout@v4"
Expand Down Expand Up @@ -251,9 +251,9 @@ jobs:
mkdir -p images
mkdir -p plugins

platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
platform="$(echo "${{ matrix.arch}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
echo "platform=${platform}" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.arch }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
if [[ "${platform}" == "linux/arm64" ]]; then
echo "plugin_arch=-arm64" >> $GITHUB_OUTPUT
else
Expand All @@ -272,7 +272,7 @@ jobs:
context: "release"
file: "release/clients/cmd/docker-driver/Dockerfile"
outputs: "type=local,dest=release/plugins/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}"
platforms: "${{ matrix.platform }}"
platforms: "${{ matrix.arch }}"
push: false
tags: "${{ env.IMAGE_PREFIX }}/loki-docker-driver:${{ needs.version.outputs.version }}-${{ steps.platform.outputs.platform_short }}"
- if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
Expand All @@ -291,9 +291,13 @@ jobs:
strategy:
fail-fast: true
matrix:
platform:
- "linux/amd64"
- "linux/arm64"
include:
- arch: "linux/amd64"
runs_on:
- "github-hosted-ubuntu-x64-small"
- arch: "linux/arm64"
runs_on:
- "github-hosted-ubuntu-arm64-small"
version:
needs:
- "check"
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/test-release-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ jobs:
loki-docker-driver:
needs:
- "version"
runs-on: "ubuntu-latest"
runs-on: "${{ matrix.runs_on }}"
steps:
- name: "pull release library code"
uses: "actions/checkout@v4"
Expand Down Expand Up @@ -251,9 +251,9 @@ jobs:
mkdir -p images
mkdir -p plugins

platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
platform="$(echo "${{ matrix.arch}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
echo "platform=${platform}" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.arch }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
if [[ "${platform}" == "linux/arm64" ]]; then
echo "plugin_arch=-arm64" >> $GITHUB_OUTPUT
else
Expand All @@ -272,7 +272,7 @@ jobs:
context: "release"
file: "release/clients/cmd/docker-driver/Dockerfile"
outputs: "type=local,dest=release/plugins/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}"
platforms: "${{ matrix.platform }}"
platforms: "${{ matrix.arch }}"
push: false
tags: "${{ env.IMAGE_PREFIX }}/loki-docker-driver:${{ needs.version.outputs.version }}-${{ steps.platform.outputs.platform_short }}"
- if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
Expand All @@ -291,9 +291,13 @@ jobs:
strategy:
fail-fast: true
matrix:
platform:
- "linux/amd64"
- "linux/arm64"
include:
- arch: "linux/amd64"
runs_on:
- "github-hosted-ubuntu-x64-small"
- arch: "linux/arm64"
runs_on:
- "github-hosted-ubuntu-arm64-small"
version:
needs:
- "check"
Expand Down
14 changes: 7 additions & 7 deletions workflows/build.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,15 @@ local runner = import 'runner.libsonnet',
dockerfile='Dockerfile',
context='release',
platform=[
'linux/amd64',
'linux/arm64',
r.forPlatform('linux/amd64'),
r.forPlatform('linux/arm64'),
]
)
job.new()
job.new('${{ matrix.runs_on }}')
+ job.withStrategy({
'fail-fast': true,
matrix: {
platform: platform,
include: platform,
},
})
+ job.withSteps([
Expand All @@ -174,9 +174,9 @@ local runner = import 'runner.libsonnet',
mkdir -p images
mkdir -p plugins

platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
platform="$(echo "${{ matrix.arch}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
echo "platform=${platform}" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.arch }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
if [[ "${platform}" == "linux/arm64" ]]; then
echo "plugin_arch=-arm64" >> $GITHUB_OUTPUT
else
Expand All @@ -190,7 +190,7 @@ local runner = import 'runner.libsonnet',
+ step.with({
context: context,
file: 'release/%s/%s' % [path, dockerfile],
platforms: '${{ matrix.platform }}',
platforms: '${{ matrix.arch }}',
push: false,
tags: '${{ env.IMAGE_PREFIX }}/%s:${{ needs.version.outputs.version }}-${{ steps.platform.outputs.platform_short }}' % [name],
outputs: 'type=local,dest=release/plugins/%s-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}' % name,
Expand Down
4 changes: 2 additions & 2 deletions workflows/workflows.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ local dockerPluginDir = 'clients/cmd/docker-driver';
lokiRelease.releasePRWorkflow(
imageJobs={
loki: build.image('fake-loki', 'cmd/loki'),
'loki-docker-driver': build.dockerPlugin('loki-docker-driver', dockerPluginDir, buildImage=buildImage, platform=['linux/amd64', 'linux/arm64']),
'loki-docker-driver': build.dockerPlugin('loki-docker-driver', dockerPluginDir, buildImage=buildImage),
},
buildImage=buildImage,
buildArtifactsBucket='loki-build-artifacts',
Expand All @@ -28,7 +28,7 @@ local dockerPluginDir = 'clients/cmd/docker-driver';
lokiRelease.releasePRWorkflow(
imageJobs={
loki: build.image('fake-loki', 'cmd/loki'),
'loki-docker-driver': build.dockerPlugin('loki-docker-driver', dockerPluginDir, buildImage=buildImage, platform=['linux/amd64', 'linux/arm64']),
'loki-docker-driver': build.dockerPlugin('loki-docker-driver', dockerPluginDir, buildImage=buildImage),
},
buildImage=buildImage,
buildArtifactsBucket='loki-build-artifacts',
Expand Down
Loading