From 3622eb57053e0e43fbb87645a5e84ed55b962373 Mon Sep 17 00:00:00 2001 From: DanStough Date: Fri, 6 Oct 2023 18:09:43 -0400 Subject: [PATCH] fix me 5 --- Dockerfile | 2 ++ Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c9b7f832..773bc0d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ FROM gcr.io/distroless/static-debian12:nonroot as default ARG TARGETOS ARG TARGETARCH ARG PRODUCT_VERSION +ARG BIN_NAME LABEL name="http-echo" \ maintainer="HashiCorp Consul Team " \ @@ -16,6 +17,7 @@ LABEL name="http-echo" \ summary="A test webserver that echos a response. You know, for kids." COPY dist/$TARGETOS/$TARGETARCH/$BIN_NAME / +RUN ls / EXPOSE 5678/tcp diff --git a/Makefile b/Makefile index d7e110df..8fe4a921 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ dev: bin # Docker Stuff. export DOCKER_BUILDKIT=1 -BUILD_ARGS = PRODUCT_VERSION=$(VERSION) +BUILD_ARGS = BIN_NAME=http-echo PRODUCT_VERSION=$(VERSION) TAG = $(NAME):local BA_FLAGS = $(addprefix --build-arg=,$(BUILD_ARGS)) FLAGS = --platform $(PLATFORM) --tag $(TAG) $(BA_FLAGS)