Ver Fonte

switch to docker based web builds

Blake Blackshear há 4 anos atrás
pai
commit
b022bec1fa
3 ficheiros alterados com 13 adições e 2 exclusões
  1. 1 1
      Makefile
  2. 3 1
      docker/Dockerfile.base
  3. 9 0
      docker/Dockerfile.web

+ 1 - 1
Makefile

@@ -6,7 +6,7 @@ version:
 	echo "VERSION='0.8.0-$(COMMIT_HASH)'" > frigate/version.py
 
 web:
-	cd web && npm install && npm run build
+	docker build --tag frigate-web --file docker/Dockerfile.web web/
 
 amd64_wheels:
 	docker build --tag blakeblackshear/frigate-wheels:amd64 --file docker/Dockerfile.wheels .

+ 3 - 1
docker/Dockerfile.base

@@ -2,6 +2,7 @@ ARG ARCH=amd64
 ARG FFMPEG_VERSION
 FROM blakeblackshear/frigate-wheels:${ARCH} as wheels
 FROM blakeblackshear/frigate-ffmpeg:${FFMPEG_VERSION}-${ARCH} as ffmpeg
+FROM frigate-web as web
 
 FROM ubuntu:20.04
 LABEL maintainer "blakeb@blakeshome.com"
@@ -45,7 +46,8 @@ RUN wget -q https://github.com/google-coral/test_data/raw/master/ssdlite_mobiled
 WORKDIR /opt/frigate/
 ADD frigate frigate/
 ADD migrations migrations/
-ADD web/build web/
+
+COPY --from=web /opt/frigate/build web/
 
 COPY run.sh /run.sh
 RUN chmod +x /run.sh

+ 9 - 0
docker/Dockerfile.web

@@ -0,0 +1,9 @@
+ARG NODE_VERSION=14.0
+
+FROM node:${NODE_VERSION}
+
+WORKDIR /opt/frigate
+
+COPY . .
+
+RUN npm install && npm run build