diff --git a/docker/Dockerfile b/docker/Dockerfile index 8452336..6f858c4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM jrottenberg/ffmpeg:4-ubuntu RUN \ apt update && \ @@ -10,8 +10,11 @@ RUN \ rm -rf pingos && \ apt autoclean && apt autoremove && \ rm -rf /var/lib/apt/lists/* && \ - rm -rf /var/cache/apt/* + rm -rf /var/cache/apt/* && \ + cp /usr/local/bin/ffmpeg /usr/bin WORKDIR /usr/local/pingos/ -CMD ["./sbin/nginx", "-g", "daemon off;"] +ENTRYPOINT [ "./sbin/nginx" ] +CMD ["-g", "daemon off;"] + diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d611fba..98f0576 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -7,7 +7,6 @@ services: - ./conf/nginx.conf:/usr/local/pingos/conf/nginx.conf:ro - type: tmpfs target: /tmp - command: [./sbin/nginx, '-g', 'daemon off;'] network_mode: "host" privileged: true restart: always