From 3a44caa8fff01bfb2375b108a3bca755fd7dc85d Mon Sep 17 00:00:00 2001 From: James Mills Date: Sun, 7 Feb 2021 21:37:51 +1000 Subject: [PATCH] Fix Docker image and temp fix for upstream broken minify --- Dockerfile | 6 ++++++ Makefile | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3deb4d1..16c02e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,12 @@ COPY go.sum . # Install deps RUN make deps + +# XXX: https://github.com/tdewolff/minify/issues/374 +RUN wget https://github.com/tdewolff/minify/releases/download/v2.9.11/minify_linux_amd64.tar.gz && \ + tar -C /go/bin -xvf minify_linux_amd64.tar.gz minify && \ + chmod +x /go/bin/minify + RUN go mod download # Copy static assets diff --git a/Makefile b/Makefile index 9f531c5..aac58db 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,8 @@ all: build deps: @go get -u github.com/GeertJohan/go.rice/rice - @go get -u github.com/tdewolff/minify/v2/cmd/... + # XXX: https://github.com/tdewolff/minify/issues/374 + #@go get -u github.com/tdewolff/minify/v2/cmd/... dev : DEBUG=1 dev : build