feat: use packr for assets

sgtm-club · Jun 21, 2020 · dc50a9e · dc50a9e
1 parent 8611493
commit dc50a9e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -2,7 +2,7 @@
 ## Specific to .dockerignore
 ##
 
-.git/
+#.git/
 Dockerfile
 contrib/
 

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+packrd/
+*-packr.go
 config.txt
 # Temporary files
 *~

diff --git a/Dockerfile b/Dockerfile
@@ -6,11 +6,13 @@ ARG             VERSION
 # build
 FROM            golang:1.14-alpine as builder
 RUN             apk add --no-cache git gcc musl-dev make
+RUN             go get -u github.com/gobuffalo/packr/v2/packr2
 ENV             GO111MODULE=on
 WORKDIR         /go/src/moul.io/bounce
 COPY            go.* ./
 RUN             go mod download
 COPY            . ./
+RUN             make packr
 RUN             make install
 
 # minimalist runtime

diff --git a/Makefile b/Makefile
@@ -25,8 +25,13 @@ run-discord: install
 run-server: install
 	bounce --dev-mode --enable-server run
 
+.PHONY: packr
+packr:
+	(cd static; git clean -fxd)
+	packr2
+
 .PHONY: docker.push
-docker.push: generate docker.build
+docker.push: tidy generate docker.build
 	docker push $(DOCKER_IMAGE)
 
 PROTOS_SRC := $(wildcard ./api/*.proto)

diff --git a/go.sum b/go.sum