limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

use z flag

Browse source
This commit is contained in:
Floatingghost 2024-06-01 10:52:19 +01:00
parent 5e0c61fa8f
commit 1c06f6de29
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
docker-compose.yml
View file

@ -15,9 +15,8 @@ services:
POSTGRES_PASSWORD: akkoma, POSTGRES_PASSWORD: akkoma,
} }
volumes: volumes:
- type: bind - ./pgdata:/var/lib/postgresql/data:z
source: ./pgdata
target: /var/lib/postgresql/data
akkoma: akkoma:
image: akkoma/akkoma:next image: akkoma/akkoma:next
@ -35,9 +34,9 @@ services:
"127.0.0.1:4000:4000", "127.0.0.1:4000:4000",
] ]
volumes: volumes:
- ./config/prod.secret.exs:/etc/akkoma/config.exs - ./config/prod.secret.exs:/etc/akkoma/config.exs:z
- ./uploads:/opt/akkoma/uploads - ./uploads:/opt/akkoma/uploads:z
- ./instance:/opt/akkoma/instance - ./instance:/opt/akkoma/instance:z
# Copy this into docker-compose.override.yml and uncomment there if you want to use a reverse proxy # Copy this into docker-compose.override.yml and uncomment there if you want to use a reverse proxy
#proxy: #proxy:

5
docker-resources/generate-instance.sh
View file

@ -4,14 +4,15 @@ set -euo pipefail
mkdir -p pgdata mkdir -p pgdata
mkdir -p docker-setup-tmp mkdir -p docker-setup-tmp
chmod a+w docker-setup-tmp
# This is sorta special in that we need the generated_config.exs to make it onto the host # This is sorta special in that we need the generated_config.exs to make it onto the host
# We can also automate the DB setup here! # We can also automate the DB setup here!
docker compose run \ docker compose run \
--rm \ --rm \
-e "PLEROMA_CTL_RPC_DISABLED=true" \ -e "PLEROMA_CTL_RPC_DISABLED=true" \
-v $(pwd)/docker-setup-tmp:/opt/akkoma/config/ \ -v $(pwd)/docker-setup-tmp:/opt/akkoma/config/:z \
akkoma ./bin/pleroma_ctl instance gen --no-sql-user --no-db-creation --dbhost db --dbname akkoma --dbuser akkoma --dbpass akkoma --listen-ip 0.0.0.0 --listen-port 4000 --static-dir /opt/akkoma/instance/ --uploads-dir /opt/akkoma/uploads/ --db-configurable true akkoma ./bin/pleroma_ctl instance gen --no-sql-user --no-db-creation --dbhost db --dbname akkoma --dbuser akkoma --dbpass akkoma --listen-ip 0.0.0.0 --listen-port 4000 --static-dir /opt/akkoma/instance/ --uploads-dir /opt/akkoma/uploads/ --db-configurable true --output /opt/akkoma/config/generated_config.exs --output-psql /opt/akkoma/config/setup_db.psql
echo "" echo ""
echo "==========================" echo "=========================="