Build in container (#31)

.dockerignore

@@ -1,2 +1 @@
 node_modules
-package-lock.json

.github/workflows/build.yml

@@ -5,6 +5,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
-      - run: cd frontend && yarn install
-      - run: cd backend && yarn install
-      - run: make cleanpush
+      - run: make push

Dockerfile

@@ -2,10 +2,24 @@ FROM node:lts
 
 WORKDIR /opt/betterschuman
 
+COPY entrypoint.sh .
+RUN chmod ug+x entrypoint.sh
+
 COPY backend/package.json .
-RUN npm install --production
 
-COPY backend/dist .
-COPY frontend/dist ./static
+RUN yarn install --production
+
+WORKDIR /tmp/betterschuman
+
+COPY backend ./backend
+COPY frontend ./frontend
+RUN cd frontend && yarn install && yarn run build
+RUN cd backend && yarn install && yarn run build
+
+WORKDIR /opt/betterschuman
+
+RUN cp -r /tmp/betterschuman/backend/dist/* .
+RUN cp -r /tmp/betterschuman/frontend/dist static
 
-CMD node main.js
+RUN rm -r /tmp/betterschuman
+ENTRYPOINT ["/opt/betterschuman/entrypoint.sh"]

Makefile

@@ -3,15 +3,7 @@ branchName := $(shell git rev-parse --abbrev-ref HEAD)
 tagName := $(shell git describe --tags)
 
 
-default: cleanbuild
-
-
-frontend/dist: $(wildcard frontend/src/**)
-	cd frontend && yarn build
-
-backend/dist: $(wildcard backend/src/**)
-	cd backend && yarn build
-
+default: build
 
 push: build
 	docker push kruemmelspalter/betterschuman:$(commitHash)
@@ -35,14 +27,5 @@ deploy: build
 tests: $(wildcard backend/test/**) $(wildcard backend/**)
 	cd backend && npm run test && npm run test:cov
 
-clean: frontend/dist backend/dist
-	rm -rv backend/dist frontend/dist
-
-build: backend/dist frontend/dist
+build:
 	docker build . -t kruemmelspalter/betterschuman:$(commitHash)
-
-cleanbuild: build clean
-
-cleanpush: push clean
-
-cleandeploy: deploy clean

entrypoint.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+cd "$0"/.. || exit
+node main.js