From 514e19c8638757c480da20db296a2f9e84791a71 Mon Sep 17 00:00:00 2001 From: Sunoru Date: Mon, 17 Jul 2023 21:03:30 +0100 Subject: [PATCH] Mount whole mastodon folder. --- Dockerfile | 4 ++-- docker-compose.yml | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7f1aab6..f6a171e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ FROM tootsuite/mastodon:v4.1.4 USER root RUN mkdir -p /var/cache/apt/archives/partial && apt autoclean -RUN apt update && apt-get install -y sudo vim htop && rm -rf /var/lib/apt/lists/* +RUN apt update && apt-get install -y sudo vim htop git curl && rm -rf /var/lib/apt/lists/* # Restore working dir +# USER mastodon WORKDIR /opt/mastodon - diff --git a/docker-compose.yml b/docker-compose.yml index 4ebd574..3be5e7b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,8 +45,8 @@ services: - db - redis volumes: - - ./mastodon/public:/mastodon/public - # - ./mastodon/public/system:/mastodon/public/system + - ./mastodon:/mastodon + # - ./mastodon/public:/mastodon/public streaming: container_name: mastodon-streaming @@ -84,8 +84,8 @@ services: - CMD-SHELL - ps aux | grep '[s]idekiq 6' || false volumes: - - ./mastodon/public:/mastodon/public - # - ./mastodon/public/system:/mastodon/public/system + - ./mastodon:/mastodon + # - ./mastodon/public:/mastodon/public nginx: container_name: mastodon-nginx @@ -99,7 +99,8 @@ services: - 127.0.0.1:3001:80 # - 127.0.0.1:3002:443 volumes: - - ./mastodon/public:/mastodon/public + - ./mastodon:/mastodon + # - ./mastodon/public:/mastodon/public - ./nginx/cache:/var/cache/nginx - ./nginx/conf.d:/etc/nginx/conf.d