From b7423896d1024965f4729b91cca0ed472ab290c0 Mon Sep 17 00:00:00 2001 From: Thomas Sileo Date: Sat, 30 Jul 2022 09:02:04 +0200 Subject: [PATCH] Simplify Docker support --- Dockerfile | 2 +- docs/install.md | 6 ------ misc/docker_start.sh | 3 +++ 3 files changed, 4 insertions(+), 7 deletions(-) create mode 100755 misc/docker_start.sh diff --git a/Dockerfile b/Dockerfile index bd510b5..f0343ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,4 +25,4 @@ RUN chown -R 1000:1000 /app USER microblogpub WORKDIR /app EXPOSE 8000 -CMD ["supervisord", "-n", "-c", "misc/docker-supervisord.conf"] +CMD ["./misc/docker_start.sh"] diff --git a/docs/install.md b/docs/install.md index f898adb..a4b8f88 100644 --- a/docs/install.md +++ b/docs/install.md @@ -32,12 +32,6 @@ Update `data/profile.toml` and add this line: trusted_hosts = ["*"] ``` -Build static assets. - -```bash -make update -``` - Start the app with Docker Compose, it will listen on port 8000 by default. ```bash diff --git a/misc/docker_start.sh b/misc/docker_start.sh new file mode 100755 index 0000000..3c53201 --- /dev/null +++ b/misc/docker_start.sh @@ -0,0 +1,3 @@ +#!/bin/sh +inv update +exec supervisord -n -c misc/docker-supervisord.conf