From 4aab1832b56cb99c2c85c8aba39c1d91d174bc74 Mon Sep 17 00:00:00 2001
From: James Mills <1290234+prologic@users.noreply.github.com>
Date: Thu, 16 Mar 2023 18:37:41 +1000
Subject: [PATCH] Fix missing minify dependency and docker image

---
 Dockerfile | 12 ++++++++++--
 Makefile   |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3a1085e..d134590 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,18 @@
 # Build
-FROM prologic/zs AS build
+FROM golang:alpine AS build
+
+RUN apk add --no-cache -U build-base git
 
 RUN mkdir -p /src
 
 WORKDIR /src
 
+# Copy Makefile
+COPY Makefile ./
+
+# Install deps
+RUN make deps
+
 # Copy content
 COPY . .
 
@@ -12,6 +20,6 @@ COPY . .
 RUN zs build
 
 # Runtime
-FROM prologic/zs AS runtime
+FROM prologic/static AS runtime
 
 COPY --from=build /src/.pub /data
diff --git a/Makefile b/Makefile
index 5ee51d9..f55f266 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ all: build
 
 deps:
 	@$(GOCMD) install go.mills.io/zs@latest
+	@$(GOCMD) install github.com/tdewolff/minify/v2/cmd/minify@latest
 
 dev : DEBUG=1
 dev : build