From 2feb646767c97147e4c245a74cedb90d6d3d1f15 Mon Sep 17 00:00:00 2001 From: sh0rez Date: Mon, 12 Aug 2019 21:53:42 +0200 Subject: [PATCH] chore(packaging): wrong executable format Due to an invalid usage of bash, the binary was always built for amd64. This fixes that and builds the correct one. --- cmd/loki-canary/Dockerfile | 2 +- cmd/loki/Dockerfile | 2 +- cmd/promtail/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/loki-canary/Dockerfile b/cmd/loki-canary/Dockerfile index bffb6b31d0f6e..7c6e264c824ed 100644 --- a/cmd/loki-canary/Dockerfile +++ b/cmd/loki-canary/Dockerfile @@ -10,7 +10,7 @@ FROM --platform=linux/amd64 $BUILD_IMAGE as build COPY --from=goenv /goarch /goarm / COPY . /go/src/github.com/grafana/loki WORKDIR /go/src/github.com/grafana/loki -RUN GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make clean && make loki-canary +RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make loki-canary FROM alpine:3.9 RUN apk add --update --no-cache ca-certificates diff --git a/cmd/loki/Dockerfile b/cmd/loki/Dockerfile index c40d0271e083b..c90e66ae2734d 100644 --- a/cmd/loki/Dockerfile +++ b/cmd/loki/Dockerfile @@ -10,7 +10,7 @@ FROM --platform=linux/amd64 $BUILD_IMAGE as build COPY --from=goenv /goarch /goarm / COPY . /go/src/github.com/grafana/loki WORKDIR /go/src/github.com/grafana/loki -RUN GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make clean && make loki +RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make loki FROM alpine:3.9 RUN apk add --update --no-cache ca-certificates diff --git a/cmd/promtail/Dockerfile b/cmd/promtail/Dockerfile index 5eb1739ad9336..259f39ce3b043 100644 --- a/cmd/promtail/Dockerfile +++ b/cmd/promtail/Dockerfile @@ -10,7 +10,7 @@ FROM --platform=linux/amd64 $BUILD_IMAGE as build COPY --from=goenv /goarch /goarm / COPY . /go/src/github.com/grafana/loki WORKDIR /go/src/github.com/grafana/loki -RUN GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make clean && make promtail +RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make promtail # Promtail requires debian as the base image to support systemd journal reading FROM debian:stretch-slim