Merge branch 'docker-fixes' into 'develop'

Docker fixes

See merge request soapbox-pub/soapbox-be!153

.dockerignore

@@ -9,3 +9,65 @@ test/
 
 # Required to get version
 !.git
+
+# App artifacts
+/_build
+/db
+/deps
+/*.ez
+/test/instance
+/test/uploads
+/.elixir_ls
+/test/fixtures/DSCN0010_tmp.jpg
+/test/fixtures/test_tmp.txt
+/test/fixtures/image_tmp.jpg
+/test/tmp/
+/test/frontend_static_test/
+/doc
+/instance
+/priv/ssh_keys
+
+# Prevent committing custom emojis
+/priv/static/emoji/custom/*
+
+# Generated on crash by the VM
+erl_crash.dump
+
+# Files matching config/*.secret.exs pattern contain sensitive
+# data and you should not commit them into version control.
+#
+# Alternatively, you may comment the line below and commit the
+# secrets files as long as you replace their contents by environment
+# variables.
+/config/*.secret.exs
+/config/generated_config.exs
+/config/runtime.exs
+/config/*.env
+
+
+# Database setup file, some may forget to delete it
+/config/setup_db*.psql
+
+# Whitelist Landing FE
+!/instance/static/frontends/landing-fe/vendor/**
+
+.DS_Store
+.env
+
+# Editor config
+/.vscode/
+
+# Prevent committing docs files
+/priv/static/doc/*
+docs/generated_config.md
+
+# Code test coverage
+/cover
+/Elixir.*.coverdata
+
+.idea
+pleroma.iml
+
+# Editor temp files
+/*~
+/*#

Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:22.04 as build
 
-ENV MIX_ENV=prod \
+ARG MIX_ENV=prod \
     OAUTH_CONSUMER_STRATEGIES="twitter facebook google microsoft slack github keycloak:ueberauth_keycloak_strategy"
 
 WORKDIR /src

config/docker.exs

@@ -19,9 +19,9 @@
 
   _ ->
     config :pleroma, Pleroma.Repo,
-      username: System.get_env("DB_USER", "pleroma"),
-      password: System.fetch_env!("DB_PASS"),
-      database: System.get_env("DB_NAME", "pleroma"),
+      username: System.get_env("DB_USER", "postgres"),
+      password: System.fetch_env!("DB_PASS", "postgres"),
+      database: System.get_env("DB_NAME", "postgres"),
       hostname: System.get_env("DB_HOST", "db")
 end
 

docker-entrypoint.sh

@@ -2,10 +2,10 @@
 
 set -e
 
-DATABASE_URL=${DATABASE_URL:"postgres://${DB_HOST:-db}:5432/${DB_NAME:-pleroma}"}
+DATABASE_URL=${DATABASE_URL:-"postgres://${DB_USER:-postgres}:${DB_PASS:-postgres}@${DB_HOST:-db}:5432/${DB_NAME:-postgres}"}
 
 echo "-- Waiting for database..."
-while ! pg_isready -U ${DB_USER:-pleroma} -d $DATABASE_URL -t 1; do
+while ! pg_isready -d $DATABASE_URL -t 1; do
     sleep 1s
 done