From 260afbdb04aeacddc9c49781958ab8a7e1c9cbc5 Mon Sep 17 00:00:00 2001 From: Rafael Gaspar Date: Mon, 12 Sep 2022 13:07:44 +0200 Subject: [PATCH] Re-add extra empty line on Dockerfile-alpine --- public-docker-images/Dockerfile-alpine | 1 + public-docker-images/README.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public-docker-images/Dockerfile-alpine b/public-docker-images/Dockerfile-alpine index 384f185f2..691f0aa79 100644 --- a/public-docker-images/Dockerfile-alpine +++ b/public-docker-images/Dockerfile-alpine @@ -7,6 +7,7 @@ RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -a -ldflags "-X git GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -a -o /build/veneur-prometheus ./cmd/veneur-prometheus &&\ GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -a -ldflags "-X github.com/stripe/veneur/v14/util/build.VERSION=${VERSION} -X github.com/stripe/veneur/v14/util/build.BUILD_DATE=$(date +%s)" -o /build/veneur-proxy ./cmd/veneur-proxy + FROM alpine:3.16 AS release LABEL maintainer="The Stripe Observability Team " RUN apk add --no-cache ca-certificates diff --git a/public-docker-images/README.md b/public-docker-images/README.md index f8691d25f..73285a00d 100644 --- a/public-docker-images/README.md +++ b/public-docker-images/README.md @@ -9,13 +9,13 @@ You should run these commands from the project root. For the Debian-based image: ``` -docker buildx build --platform=linux/amd64,linux/arm64 --build-arg=VERSION=$(git rev-parse HEAD) --no-cache -t veneur:local -f public-docker-images/Dockerfile-debian-sid --output tar . | docker import - +docker buildx build --platform=linux/amd64,linux/arm64 --build-arg=VERSION=$(git rev-parse HEAD) --no-cache -t veneur:local -f public-docker-images/Dockerfile-debian-sid --output=tar . | docker import - ``` For the Alpine Linux-based image: ``` -docker buildx build --platform=linux/amd64,linux/arm64 --build-arg=VERSION=$(git rev-parse HEAD) --no-cache -t veneur:local -f public-docker-images/Dockerfile-alpine --output tar . | docker import - +docker buildx build --platform=linux/amd64,linux/arm64 --build-arg=VERSION=$(git rev-parse HEAD) --no-cache -t veneur:local -f public-docker-images/Dockerfile-alpine --output=tar . | docker import - ``` For both cases you could remove ```--platform` arugment if you just plan build for the host architechture.