Skip to content

Commit

Permalink
removing old node relay
Browse files Browse the repository at this point in the history
  • Loading branch information
blakeblackshear committed Jun 12, 2021
1 parent 4596ada commit 700f25a
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 104 deletions.
11 changes: 4 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ version:
web:
docker build --tag frigate-web --file docker/Dockerfile.web web/

jsmpeg:
docker build --tag frigate-jsmpeg --file docker/Dockerfile.jsmpeg jsmpeg/

amd64_wheels:
docker build --tag blakeblackshear/frigate-wheels:1.0.3-amd64 --file docker/Dockerfile.wheels .

Expand All @@ -20,7 +17,7 @@ amd64_ffmpeg:
nginx_frigate:
docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag blakeblackshear/frigate-nginx:1.0.0 --file docker/Dockerfile.nginx .

amd64_frigate: version web jsmpeg
amd64_frigate: version web
docker build --tag frigate-base --build-arg ARCH=amd64 --build-arg FFMPEG_VERSION=1.1.0 --build-arg WHEELS_VERSION=1.0.3 --build-arg NGINX_VERSION=1.0.0 --file docker/Dockerfile.base .
docker build --tag frigate --file docker/Dockerfile.amd64 .

Expand All @@ -32,7 +29,7 @@ amd64nvidia_wheels:
amd64nvidia_ffmpeg:
docker build --tag blakeblackshear/frigate-ffmpeg:1.0.0-amd64nvidia --file docker/Dockerfile.ffmpeg.amd64nvidia .

amd64nvidia_frigate: version web jsmpeg
amd64nvidia_frigate: version web
docker build --tag frigate-base --build-arg ARCH=amd64nvidia --build-arg FFMPEG_VERSION=1.0.0 --build-arg WHEELS_VERSION=1.0.3 --build-arg NGINX_VERSION=1.0.0 --file docker/Dockerfile.base .
docker build --tag frigate --file docker/Dockerfile.amd64nvidia .

Expand All @@ -44,7 +41,7 @@ aarch64_wheels:
aarch64_ffmpeg:
docker build --tag blakeblackshear/frigate-ffmpeg:1.0.0-aarch64 --file docker/Dockerfile.ffmpeg.aarch64 .

aarch64_frigate: version web jsmpeg
aarch64_frigate: version web
docker build --tag frigate-base --build-arg ARCH=aarch64 --build-arg FFMPEG_VERSION=1.0.0 --build-arg WHEELS_VERSION=1.0.3 --build-arg NGINX_VERSION=1.0.0 --file docker/Dockerfile.base .
docker build --tag frigate --file docker/Dockerfile.aarch64 .

Expand All @@ -56,7 +53,7 @@ armv7_wheels:
armv7_ffmpeg:
docker build --tag blakeblackshear/frigate-ffmpeg:1.0.0-armv7 --file docker/Dockerfile.ffmpeg.armv7 .

armv7_frigate: version web jsmpeg
armv7_frigate: version web
docker build --tag frigate-base --build-arg ARCH=armv7 --build-arg FFMPEG_VERSION=1.0.0 --build-arg WHEELS_VERSION=1.0.3 --build-arg NGINX_VERSION=1.0.0 --file docker/Dockerfile.base .
docker build --tag frigate --file docker/Dockerfile.armv7 .

Expand Down
7 changes: 2 additions & 5 deletions docker/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ FROM blakeblackshear/frigate-wheels:${WHEELS_VERSION}-${ARCH} as wheels
FROM blakeblackshear/frigate-ffmpeg:${FFMPEG_VERSION}-${ARCH} as ffmpeg
FROM blakeblackshear/frigate-nginx:${NGINX_VERSION} as nginx
FROM frigate-web as web
FROM frigate-jsmpeg as jsmpeg

FROM ubuntu:20.04
LABEL maintainer "[email protected]"
Expand Down Expand Up @@ -41,7 +40,8 @@ RUN pip3 install \
voluptuous\
Flask-Sockets \
gevent \
gevent-websocket
gevent-websocket \
ws4py

COPY --from=nginx /usr/local/nginx/ /usr/local/nginx/

Expand All @@ -56,9 +56,6 @@ ADD migrations migrations/

COPY --from=web /opt/frigate/build web/

COPY --from=jsmpeg /opt/build jsmpeg/
COPY --from=jsmpeg /usr/local/bin/node /usr/local/bin/node

COPY docker/rootfs/ /

EXPOSE 5000
Expand Down
10 changes: 0 additions & 10 deletions docker/Dockerfile.jsmpeg

This file was deleted.

1 change: 0 additions & 1 deletion jsmpeg/.gitignore

This file was deleted.

13 changes: 0 additions & 13 deletions jsmpeg/package-lock.json

This file was deleted.

14 changes: 0 additions & 14 deletions jsmpeg/package.json

This file was deleted.

54 changes: 0 additions & 54 deletions jsmpeg/relay.js

This file was deleted.

0 comments on commit 700f25a

Please sign in to comment.