From 4c27138497b8f9aadca4531c676e962b1a32d1f1 Mon Sep 17 00:00:00 2001
From: Martyn Ranyard <m@rtyn.berlin>
Date: Sat, 1 Aug 2020 11:38:05 +0200
Subject: [PATCH] Build the React frontend

Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
---
 Makefile                 | 5 +++++
 build/ci/drone.yml       | 5 +++++
 build/package/Dockerfile | 7 ++++++-
 build/react-frontend     | 1 +
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 160000 build/react-frontend

diff --git a/Makefile b/Makefile
index c1d7692..1d9e877 100755
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,11 @@ test:
 build:
 	go build ${LDFLAGS}
 
+build-frontend:
+	cd build/react-frontend && npm run build
+	rm -rf web/react-frontend ; mkdir -p web/react-frontend
+	cp -r build/react-frontend/build/* web/react-frontend/
+
 deps:
 	go get
 
diff --git a/build/ci/drone.yml b/build/ci/drone.yml
index 3df9267..1735fa4 100644
--- a/build/ci/drone.yml
+++ b/build/ci/drone.yml
@@ -59,6 +59,11 @@ steps:
   - make test
   - make
 
+- name: build-frontend
+  image: node
+  commands:
+  - make frontend
+
 trigger:
   ref:
   - refs/heads/main
diff --git a/build/package/Dockerfile b/build/package/Dockerfile
index 7fa9cba..466f374 100755
--- a/build/package/Dockerfile
+++ b/build/package/Dockerfile
@@ -5,9 +5,14 @@ COPY internal/ /go/src/git.martyn.berlin/martyn/twitchsingstools/internal/
 COPY Makefile /go/src/git.martyn.berlin/martyn/twitchsingstools/
 RUN cd /go/src/git.martyn.berlin/martyn/twitchsingstools/; make deps ; make static
 
-FROM scratch
+FROM library/node:14.7.0-stretch AS frontend
+COPY build/react-frontend /frontend
+RUN cd /frontend; npm run build
+
+FROM debian
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /go/src/git.martyn.berlin/martyn/twitchsingstools /app/
 COPY web/ /app/web/
+COPY --from=frontend /frontend/build /app/web/react-frontend
 WORKDIR /app
 CMD ["/app/twitchsingstools"]
diff --git a/build/react-frontend b/build/react-frontend
new file mode 160000
index 0000000..5d2ed3c
--- /dev/null
+++ b/build/react-frontend
@@ -0,0 +1 @@
+Subproject commit 5d2ed3c5be7d050e48b6bedbd2591543d732bf52