summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Friedli2020-04-12 15:52:29 +0200
committerJan Friedli2020-05-09 21:25:46 +0200
commit3d89015d6bb284a09614449c61a0e472bcf99167 (patch)
treec50dde33886bf7fb4388d709299ea8db656c11fb
parentf3019b3b3221bbe795d56a433e889f8a9d39c87d (diff)
added ffmpeg to dockerfile
-rw-r--r--Dockerfile.production1
-rw-r--r--README.md2
2 files changed, 2 insertions, 1 deletions
diff --git a/Dockerfile.production b/Dockerfile.production
index 35eb553..0f582d7 100644
--- a/Dockerfile.production
+++ b/Dockerfile.production
@@ -18,6 +18,7 @@ RUN set -x \
18 ca-certificates \ 18 ca-certificates \
19 nginx \ 19 nginx \
20 systemd \ 20 systemd \
21 ffmpeg \
21 mat2 \ 22 mat2 \
22 uwsgi \ 23 uwsgi \
23 uwsgi-plugin-python3 \ 24 uwsgi-plugin-python3 \
diff --git a/README.md b/README.md
index 9d59bef..04b863f 100644
--- a/README.md
+++ b/README.md
@@ -202,7 +202,7 @@ This does mount the upload folder as tmpfs and servers the app on `localhost:818
202##### Podman 202##### Podman
203Build: `podman build -f Dockerfile.production -t matweb-podman .` 203Build: `podman build -f Dockerfile.production -t matweb-podman .`
204 204
205Run: `podman run -ti -p8181:8080 --read-only --tmpfs /tmp --tmpfs /run/uwsgi --tmpfs=/app/upload --security-opt=no-new-privileges,seccomp=./config/seccomp.json matweb-podman:latest` 205Run: `podman run -ti -p8181:8080 --read-only --tmpfs /tmp --tmpfs /run/uwsgi --tmpfs=/app/upload --security-opt=no-new-privileges --security-opt=seccomp=./config/seccomp.json matweb-podman:latest`
206 206
207# Configuration 207# Configuration
208 208