Merge pull request #13 from sillydong/master

update docker build
danesparza · May 30, 2019 · 18a2c2b · 18a2c2b
2 parents c92eb0c + 58e1e77
commit 18a2c2b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,8 @@
-FROM nginx:stable-alpine
-
-ADD build /usr/share/nginx/html
+FROM node:latest as build
+WORKDIR /app
+COPY . /app
+RUN yarn install && yarn build
 
+FROM nginx:stable-alpine
+COPY --from=build /app/build /usr/share/nginx/html
 EXPOSE 80
diff --git a/Makefile b/Makefile
@@ -1,14 +1,11 @@
 BUILDVERSION=$(shell git describe --tags --always)
 
-all: buildd docker
+all: docker
 
-buildd:
-	yarn build
-
-docker: buildd
+docker:
 	docker build -t influxdb-ui:$(BUILDVERSION) .
 
-publish: buildd docker
+publish: docker
 	docker tag influxdb-ui:$(BUILDVERSION) sillydong/influxdb-ui:$(BUILDVERSION)
 	docker tag influxdb-ui:$(BUILDVERSION) sillydong/influxdb-ui:latest
 	docker push sillydong/influxdb-ui:$(BUILDVERSION)