From d9a688dbd17903eff3d61b4de6a381bbb9d6689d Mon Sep 17 00:00:00 2001
From: Chris Sexton <chrissexton@users.noreply.github.com>
Date: Tue, 17 Mar 2020 10:36:23 -0400
Subject: [PATCH] docker: change container to work with esc

* Also fix esc generate command
---
 docker/Dockerfile | 7 +++----
 esc_gen.go        | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 12b0c3d..782b225 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:edge
+FROM golang:alpine
 
 RUN apk add --no-cache git
 RUN apk add --no-cache musl-dev
@@ -27,8 +27,7 @@ ENV TZ America/New_York
 
 # RUN yarn global add @vue/cli
 RUN cd $SRC_DIR/frontend; yarn && yarn build
-RUN go get -u github.com/gobuffalo/packr/v2/packr2
-RUN cd $SRC_DIR; $HOME/go/bin/packr2
-RUN cd $SRC_DIR; go get ./...; go build -o /app/cabinet
+RUN go get -u github.com/mjibson/esc
+RUN cd $SRC_DIR; go generate && go get ./... && go build -o /app/cabinet
 
 ENTRYPOINT ["/app/cabinet", "-httpAddr=0.0.0.0:5673", "-db=/app/var/cabinet.db"]
diff --git a/esc_gen.go b/esc_gen.go
index b775ffc..d13e45b 100644
--- a/esc_gen.go
+++ b/esc_gen.go
@@ -1,2 +1,2 @@
-//go:generate esc -o esc.go -prefix="frontend/dist" frontend/dist
+//go:generate esc -prefix="frontend/dist" -o esc.go frontend/dist
 package main