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.

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

WIP: investigate 32-bit ARM promtail build #1732

Closed
wants to merge 3 commits into from
Closed
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
7 changes: 4 additions & 3 deletions .drone/drone.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ local docker(arch, app) = {
},
};

local arch_image(arch, tags='') = {
local arch_image(arch, tags='', variant='') = {
platform: {
os: 'linux',
arch: arch,
variant: variant,
},
steps: [{
name: 'image-tag',
Expand Down Expand Up @@ -83,7 +84,7 @@ local fluentbit() = pipeline('fluent-bit-amd64') + arch_image('amd64', 'latest,m
depends_on: ['check'],
};

local multiarch_image(arch) = pipeline('docker-' + arch) + arch_image(arch) {
local multiarch_image(arch, variant='') = pipeline('docker-' + arch) + arch_image(arch, variant=variant) {
steps+: [
// dry run for everything that is not tag or master
docker(arch, app) {
Expand Down Expand Up @@ -153,7 +154,7 @@ local manifest(apps) = pipeline('manifest') {
],
},
] + [
multiarch_image(arch)
multiarch_image(arch, variant=(if arch == 'arm' then 'v7' else ''))
for arch in archs
] + [
fluentbit(),
Expand Down
1 change: 1 addition & 0 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ name: docker-arm
platform:
os: linux
arch: arm
variant: v7

steps:
- name: image-tag
Expand Down
2 changes: 2 additions & 0 deletions cmd/promtail/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ ARG TOUCH_PROTOS
COPY . /src/loki
WORKDIR /src/loki
RUN apt-get update && apt-get install -qy libsystemd-dev
RUN uname -a
RUN go env
RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false promtail

# Promtail requires debian as the base image to support systemd journal reading
Expand Down