From 9deac7cc7e9c34141d6ff0346fc624f86142fb36 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Sat, 6 Jan 2024 15:30:41 -0800
Subject: [PATCH] Fix args and building

---
 Dockerfile             | 7 +++----
 Dockerfile.multi-stage | 9 ++++-----
 Makefile               | 2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6580fdc..cdf9d06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,3 @@
-ARG TARGETOS
-ARG TARGETARCH
-
 FROM alpine:3.19
 
 RUN mkdir /app
@@ -10,7 +7,9 @@ WORKDIR /app/
 RUN addgroup -S nomad-var-dirsync && adduser -S nomad-var-dirsync -G nomad-var-dirsync
 
 # Copy binary in
-COPY ./dist/nomad-var-dirsync-${TARGETOS}-${TARGETARCH} ./nomad-var-dirsync
+ARG TARGETOS
+ARG TARGETARCH
+COPY ./dist/nomad-var-dirsync-$TARGETOS-$TARGETARCH /bin/nomad-var-dirsync
 
 # Drop to non-root user
 USER nomad-var-dirsync
diff --git a/Dockerfile.multi-stage b/Dockerfile.multi-stage
index 154d30d..7916667 100644
--- a/Dockerfile.multi-stage
+++ b/Dockerfile.multi-stage
@@ -1,6 +1,3 @@
-ARG TARGETOS
-ARG TARGETARCH
-
 FROM golang:1.21-alpine AS builder
 
 RUN apk add --no-cache git=~2 && mkdir /app
@@ -12,10 +9,12 @@ RUN go mod download
 COPY ./*.go /app/
 
 ARG VERSION=dev
-ENV CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH}
+ARG TARGETOS
+ARG TARGETARCH
+ENV CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH
 RUN go build -ldflags "-X main.version=VERSION" -a -installsuffix nocgo -o nomad-var-dirsync .
 
-FROM REPO/alpine:3.19
+FROM alpine:3.19
 RUN mkdir /app
 WORKDIR /app/
 
diff --git a/Makefile b/Makefile
index c5fa4aa..3446b81 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 APP_NAME = nomad-var-dirsync
-DOCKER_TAG ?= $(APP_NAME)-USER
+DOCKER_TAG ?= $(APP_NAME)-$(USER)
 VERSION ?= $(shell git describe --tags --dirty)
 GOFILES = *.go
 # Multi-arch targets are generated from this