瀏覽代碼

add missing profiles

Christian Winther 1 年之前
父節點
當前提交
abee7d4d62
共有 2 個文件被更改,包括 15 次插入11 次删除
  1. 12 10
      .env.docker
  2. 3 1
      docker-compose.yml

+ 12 - 10
.env.docker

@@ -1080,6 +1080,9 @@ DOCKER_APP_HOST_CACHE_PATH="${DOCKER_ALL_HOST_DATA_ROOT_PATH:?error}/pixelfed/ca
 # docker redis
 ################################################################################
 
+# Set this to a non-empty value (e.g. "disabled") to disable the [redis] service
+#DOCKER_REDIS_PROFILE=
+
 # Redis version to use as Docker tag
 #
 # @see https://hub.docker.com/_/redis
@@ -1105,7 +1108,6 @@ DOCKER_REDIS_HOST_PORT="${REDIS_PORT:?error}"
 # @default ""
 # @dottie/validate required
 #DOCKER_REDIS_CONFIG_FILE="/etc/redis/redis.conf"
-
 # How often Docker health check should run for [redis] service
 #
 # @default "10s"
@@ -1116,6 +1118,9 @@ DOCKER_REDIS_HEALTHCHECK_INTERVAL="${DOCKER_ALL_DEFAULT_HEALTHCHECK_INTERVAL:?er
 # docker db
 ################################################################################
 
+# Set this to a non-empty value (e.g. "disabled") to disable the [db] service
+#DOCKER_DB_PROFILE=
+
 # Docker image for the DB service
 # @dottie/validate required
 DOCKER_DB_IMAGE="mariadb:${DB_VERSION}"
@@ -1124,9 +1129,6 @@ DOCKER_DB_IMAGE="mariadb:${DB_VERSION}"
 # @dottie/validate required
 DOCKER_DB_COMMAND="--default-authentication-plugin=mysql_native_password"
 
-# Set this to a non-empty value (e.g. "disabled") to disable the [db] service
-#DOCKER_DB_PROFILE=""
-
 # Path (on host system) where the [db] container will store its data
 #
 # Path is relative (./some/other/path) to the docker-compose.yml or absolute (/some/other/path)
@@ -1190,18 +1192,18 @@ DOCKER_WORKER_HEALTHCHECK_INTERVAL="${DOCKER_ALL_DEFAULT_HEALTHCHECK_INTERVAL:?e
 # docker proxy
 ################################################################################
 
-# The version of nginx-proxy to use
-#
-# @see https://hub.docker.com/r/nginxproxy/nginx-proxy
-# @dottie/validate required
-DOCKER_PROXY_VERSION="1.4"
-
 # Set this to a non-empty value (e.g. "disabled") to disable the [proxy] and [proxy-acme] service
 #DOCKER_PROXY_PROFILE=
 
 # Set this to a non-empty value (e.g. "disabled") to disable the [proxy-acme] service
 #DOCKER_PROXY_ACME_PROFILE="${DOCKER_PROXY_PROFILE?error}"
 
+# The version of nginx-proxy to use
+#
+# @see https://hub.docker.com/r/nginxproxy/nginx-proxy
+# @dottie/validate required
+DOCKER_PROXY_VERSION="1.4"
+
 # How often Docker health check should run for [proxy] service
 # @dottie/validate required
 DOCKER_PROXY_HEALTHCHECK_INTERVAL="${DOCKER_ALL_DEFAULT_HEALTHCHECK_INTERVAL:?error}"

+ 3 - 1
docker-compose.yml

@@ -112,9 +112,9 @@ services:
     container_name: "${DOCKER_ALL_CONTAINER_NAME_PREFIX}-worker"
     command: gosu www-data php artisan horizon
     restart: unless-stopped
-    stop_signal: SIGTERM
     profiles:
       - ${DOCKER_WORKER_PROFILE:-}
+    stop_signal: SIGTERM
     build:
       target: ${DOCKER_APP_RUNTIME}-runtime
       args:
@@ -182,6 +182,8 @@ services:
     image: redis:${DOCKER_REDIS_VERSION}
     container_name: "${DOCKER_ALL_CONTAINER_NAME_PREFIX}-redis"
     restart: unless-stopped
+    profiles:
+      - ${DOCKER_REDIS_PROFILE:-}
     command: "${DOCKER_REDIS_CONFIG_FILE:-} --requirepass '${REDIS_PASSWORD:-}'"
     environment:
       TZ: "${TZ:?error}"