diff --git a/docker-compose.yml b/docker-compose.yml index 8319e31c6..3ac94808f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,10 +21,6 @@ services: - type: bind source: ./pgdata target: /var/lib/postgresql/data - - type: bind - source: ./config - target: /docker-entrypoint-initdb.d - akkoma: image: akkoma/akkoma:next restart: unless-stopped diff --git a/docker-resources/generate-instance.sh b/docker-resources/generate-instance.sh index 3c8a310c5..0598f5bdc 100755 --- a/docker-resources/generate-instance.sh +++ b/docker-resources/generate-instance.sh @@ -10,4 +10,12 @@ docker compose run \ -e "PLEROMA_CTL_RPC_DISABLED=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 "Instance generated!" \ No newline at end of file +echo "Instance generated!" + +# setup database from generated config +# we run from the akkoma container to ensure we have the right environment! can't connect to a DB that doesn't exist yet... +docker compose run \ + --rm \ + -e "PLEROMA_CTL_RPC_DISABLED=true" \ + -e "PGPASSWORD=akkoma" \ + akkoma psql -h db -U akkoma -d akkoma -f /opt/akkoma/config/setup_db.psql \ No newline at end of file