Christian Winther 1 سال پیش
والد
کامیت
215b49ea3d
3فایلهای تغییر یافته به همراه14 افزوده شده و 7 حذف شده
  1. 2 2
      contrib/docker-compose/.env
  2. 12 5
      contrib/docker-compose/README.md
  3. 0 0
      contrib/docker-compose/docker-compose.yml

+ 2 - 2
contrib/docker-compose/.env

@@ -113,7 +113,7 @@ APP_TIMEZONE="${TZ}"
 # Defaults to "en".
 #
 # See: https://docs.pixelfed.org/technical-documentation/config/#app_fallback_locale
-APP_FALLBACK_LOCALE="en"
+#APP_FALLBACK_LOCALE="en"
 
 # See: https://docs.pixelfed.org/technical-documentation/config/#limit_account_size
 #LIMIT_ACCOUNT_SIZE="true"
@@ -368,7 +368,7 @@ MAIL_FROM_NAME="Pixelfed @ ${APP_DOMAIN}"
 # Defaults to "localhost".
 #
 # See: https://docs.pixelfed.org/technical-documentation/config/#redis_host
-REDIS_HOST="cache"
+REDIS_HOST="redis"
 
 # Defaults to null.
 #

+ 12 - 5
contrib/docker-compose/README.md

@@ -3,11 +3,18 @@
 ## Prerequisites
 
 * One of the `docker-compose.yml` files in this directory
-* A copy of the `example.env` file
+* A copy of the `example.env` file named `.env` next to `docker-compose.yml`
 
-In order to set configuration, please use a .env file in your compose project directory (the same directory as your docker-compose.yml), and set database options, application
-name, key, and other settings there.
+Your folder should look like this
 
-A list of available settings is available in .env.example
+```plain
+.
+├── .env
+└── docker-compose.yml
+```
 
-The services should scale properly across a swarm cluster if the volumes are properly shared between cluster members.
+## Modifying your settings (`.env` file)
+
+* `APP_NAME`
+* `APP_DOMAIN`
+* `DB_PASSWORD`

+ 0 - 0
contrib/docker-compose/docker-compose.apache.yml → contrib/docker-compose/docker-compose.yml