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

Install docker buildx on build image. #10833

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Install docker buildx on build image. #10833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46da98b
Install docker buildx on build image.
jeschkies Oct 9, 2023
8ee7d0e
Merge remote-tracking branch 'grafana/main' into karsten/install-dock…
jeschkies Oct 9, 2023
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
2 changes: 1 addition & 1 deletion .drone/drone.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') {

[
pipeline('loki-build-image') {
local build_image_tag = '0.30.0',
local build_image_tag = '0.31.0',
workspace: {
base: '/src',
path: 'loki',
Expand Down
6 changes: 3 additions & 3 deletions .drone/drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ steps:
dry_run: true
repo: grafana/loki-build-image
tags:
- 0.30.0
- 0.31.0
when:
event:
- pull_request
Expand All @@ -26,7 +26,7 @@ steps:
from_secret: docker_password
repo: grafana/loki-build-image
tags:
- 0.30.0
- 0.31.0
username:
from_secret: docker_username
when:
Expand Down Expand Up @@ -2017,6 +2017,6 @@ kind: secret
name: gpg_private_key
---
kind: signature
hmac: eb7db41065e88938a632f1629701027464c77f0cec6b3a93f39bec2b3dfadbec
hmac: d7342c3fd4963b8345ff398d8f605f70c04d23cac2da06ad6728d11e1b6671c5

...
2 changes: 1 addition & 1 deletion loki-build-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN apk add --no-cache curl && \
chmod +x "/usr/bin/buf"

FROM alpine:3.18.4 as docker
RUN apk add --no-cache docker-cli
RUN apk add --no-cache docker-cli docker-cli-buildx

# TODO this should be fixed to download and extract the specific release binary from github as we do for golangci and helm above
# however we need a commit which hasn't been released yet: https://github.com/drone/drone-cli/commit/1fad337d74ca0ecf420993d9d2d7229a1c99f054
Expand Down