From 82c45f0187858af3edb1ebc2e8041635a612c6ad Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Mon, 24 Feb 2020 12:22:39 -0500 Subject: [PATCH 1/3] get information on go env when building promtail --- cmd/promtail/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/promtail/Dockerfile b/cmd/promtail/Dockerfile index 1681b66e4bef3..66ac09d44ea4b 100644 --- a/cmd/promtail/Dockerfile +++ b/cmd/promtail/Dockerfile @@ -5,6 +5,7 @@ ARG TOUCH_PROTOS COPY . /src/loki WORKDIR /src/loki RUN apt-get update && apt-get install -qy libsystemd-dev +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 From c6b440200631d98a2e29edba82926782202ddbd2 Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Mon, 24 Feb 2020 12:51:17 -0500 Subject: [PATCH 2/3] print uname -a --- cmd/promtail/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/promtail/Dockerfile b/cmd/promtail/Dockerfile index 66ac09d44ea4b..6aef51030fd2e 100644 --- a/cmd/promtail/Dockerfile +++ b/cmd/promtail/Dockerfile @@ -5,6 +5,7 @@ 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 From d3e23d3f5b022fa43e20d126135fb7a7d7dd2e6c Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Mon, 24 Feb 2020 13:22:27 -0500 Subject: [PATCH 3/3] create v7 32-bit build --- .drone/drone.jsonnet | 7 ++++--- .drone/drone.yml | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet index 23f0ef7b17edb..5c7152cdc9930 100644 --- a/.drone/drone.jsonnet +++ b/.drone/drone.jsonnet @@ -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', @@ -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) { @@ -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(), diff --git a/.drone/drone.yml b/.drone/drone.yml index 68331f2a9c4fb..a3e355887e3b8 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -314,6 +314,7 @@ name: docker-arm platform: os: linux arch: arm + variant: v7 steps: - name: image-tag