fix dockerfile to pull bin from correct location

xigxog · Dec 8, 2023 · 34adadd · 34adadd
1 parent c1fe232
commit 34adadd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,10 @@
 # Compress binary
 FROM ghcr.io/xigxog/upx:4.2.1 AS upx
 
+ARG BIN
 ARG COMPRESS=false
 
-COPY ./bin/fox /fox
+COPY ${BIN} /fox
 RUN if ${COMPRESS}; then upx /fox; fi
 
 # Runtime

diff --git a/efs/embed.go b/efs/embed.go
@@ -15,5 +15,3 @@ const (
 
 //go:embed all:*
 var EFS embed.FS
-
-// TODO update demo code
diff --git a/hack/scripts/image.sh b/hack/scripts/image.sh
@@ -8,7 +8,7 @@ if ${DEBUG}; then
 	DOCKERFILE="--file Dockerfile.debug ."
 fi
 
-buildah bud --build-arg COMPRESS="${COMPRESS}" --tag "${IMAGE}" ${DOCKERFILE}
+buildah bud --build-arg BIN="${BUILD_OUT}/${BIN}" --build-arg COMPRESS="${COMPRESS}" --tag "${IMAGE}" ${DOCKERFILE}
 
 if ${PUSH}; then
 	buildah push "${IMAGE}"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,5 +15,3 @@ const (

		//go:embed all:*
		var EFS embed.FS

		// TODO update demo code