From 2e1eb04403767072869d3ef301a5509aaed8afea Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Tue, 28 Jan 2025 12:24:00 +0100
Subject: [PATCH] Adapting container build

---
 Makefile                | 2 +-
 container/Containerfile | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d3f0f6b..44666fd 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ $(RELEASE_NAME):
 	mkdir -p $@
 
 container:
-	podman build -t rexserver -f container/Containerfile .
+	podman build -t rexserver --env REX_VERSION -f container/Containerfile .
 
 clean:
 	make -C ./rex_client clean
diff --git a/container/Containerfile b/container/Containerfile
index e56067b..e97bbc5 100644
--- a/container/Containerfile
+++ b/container/Containerfile
@@ -1,4 +1,5 @@
 FROM docker.io/golang:alpine as go
+RUN apk add make
 WORKDIR /build
 # ADD rex_server/go.mod rex_server/go.sum ./ # WARNING: Include go.sum
 ADD rex_server/go.mod ./
@@ -8,7 +9,7 @@ RUN go mod download
 # Add the rest of the source
 ADD . .
 
-RUN go build -o ./rexserver ./rex_server/server.go
+RUN make -C rex_server
 
 # Runner image, drop privileges
 FROM docker.io/alpine:latest as runner
@@ -17,7 +18,7 @@ RUN addgroup nonroot nonroot
 WORKDIR /app
 RUN chown nonroot:nonroot /app
 
-COPY --from=go /build/rexserver rexserver
+COPY --from=go /build/rex_server/rexserver rexserver
 EXPOSE 8080
 USER nonroot:nonroot
 CMD ["./rexserver"]