mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-09 16:24:51 +00:00
sort keys in compose
This commit is contained in:
parent
8fd27c6f0c
commit
d9d2a475d8
1 changed files with 22 additions and 8 deletions
|
@ -25,6 +25,8 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
profiles:
|
profiles:
|
||||||
- ${DOCKER_PROXY_PROFILE:-}
|
- ${DOCKER_PROXY_PROFILE:-}
|
||||||
|
environment:
|
||||||
|
DOCKER_SERVICE_NAME: "proxy"
|
||||||
volumes:
|
volumes:
|
||||||
- "${DOCKER_PROXY_HOST_DOCKER_SOCKET_PATH}:/tmp/docker.sock:ro"
|
- "${DOCKER_PROXY_HOST_DOCKER_SOCKET_PATH}:/tmp/docker.sock:ro"
|
||||||
- "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/conf.d:/etc/nginx/conf.d"
|
- "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/conf.d:/etc/nginx/conf.d"
|
||||||
|
@ -83,17 +85,23 @@ services:
|
||||||
PHP_EXTENSIONS_EXTRA: "${DOCKER_APP_PHP_EXTENSIONS_EXTRA:-}"
|
PHP_EXTENSIONS_EXTRA: "${DOCKER_APP_PHP_EXTENSIONS_EXTRA:-}"
|
||||||
PHP_PECL_EXTENSIONS_EXTRA: "${DOCKER_APP_PHP_PECL_EXTENSIONS_EXTRA:-}"
|
PHP_PECL_EXTENSIONS_EXTRA: "${DOCKER_APP_PHP_PECL_EXTENSIONS_EXTRA:-}"
|
||||||
PHP_VERSION: "${DOCKER_APP_PHP_VERSION:?error}"
|
PHP_VERSION: "${DOCKER_APP_PHP_VERSION:?error}"
|
||||||
volumes:
|
|
||||||
- "./.env:/var/www/.env"
|
|
||||||
- "${DOCKER_APP_HOST_CACHE_PATH}:/var/www/bootstrap/cache"
|
|
||||||
- "${DOCKER_APP_HOST_STORAGE_PATH}:/var/www/storage"
|
|
||||||
- "${DOCKER_APP_HOST_OVERRIDES_PATH}:/docker/overrides:ro"
|
|
||||||
environment:
|
environment:
|
||||||
|
# Used by Pixelfed Docker init script
|
||||||
|
DOCKER_SERVICE_NAME: "web"
|
||||||
|
DOCKER_APP_ENTRYPOINT_DEBUG: ${DOCKER_APP_ENTRYPOINT_DEBUG:-0}
|
||||||
|
ENTRYPOINT_SKIP_SCRIPTS: ${ENTRYPOINT_SKIP_SCRIPTS:-}
|
||||||
|
# Used by [proxy] service
|
||||||
LETSENCRYPT_HOST: "${DOCKER_PROXY_LETSENCRYPT_HOST:?error}"
|
LETSENCRYPT_HOST: "${DOCKER_PROXY_LETSENCRYPT_HOST:?error}"
|
||||||
LETSENCRYPT_EMAIL: "${DOCKER_PROXY_LETSENCRYPT_EMAIL:?error}"
|
LETSENCRYPT_EMAIL: "${DOCKER_PROXY_LETSENCRYPT_EMAIL:?error}"
|
||||||
LETSENCRYPT_TEST: "${DOCKER_PROXY_LETSENCRYPT_TEST:-}"
|
LETSENCRYPT_TEST: "${DOCKER_PROXY_LETSENCRYPT_TEST:-}"
|
||||||
VIRTUAL_HOST: "${APP_DOMAIN}"
|
VIRTUAL_HOST: "${APP_DOMAIN}"
|
||||||
VIRTUAL_PORT: "80"
|
VIRTUAL_PORT: "80"
|
||||||
|
volumes:
|
||||||
|
- "./.env:/var/www/.env"
|
||||||
|
- "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/conf.d:/docker/shared/proxy/conf.d"
|
||||||
|
- "${DOCKER_APP_HOST_CACHE_PATH}:/var/www/bootstrap/cache"
|
||||||
|
- "${DOCKER_APP_HOST_OVERRIDES_PATH}:/docker/overrides:ro"
|
||||||
|
- "${DOCKER_APP_HOST_STORAGE_PATH}:/var/www/storage"
|
||||||
labels:
|
labels:
|
||||||
com.github.nginx-proxy.nginx-proxy.keepalive: 30
|
com.github.nginx-proxy.nginx-proxy.keepalive: 30
|
||||||
com.github.nginx-proxy.nginx-proxy.http2.enable: true
|
com.github.nginx-proxy.nginx-proxy.http2.enable: true
|
||||||
|
@ -114,9 +122,9 @@ services:
|
||||||
container_name: "${DOCKER_ALL_CONTAINER_NAME_PREFIX}-worker"
|
container_name: "${DOCKER_ALL_CONTAINER_NAME_PREFIX}-worker"
|
||||||
command: gosu www-data php artisan horizon
|
command: gosu www-data php artisan horizon
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
stop_signal: SIGTERM
|
||||||
profiles:
|
profiles:
|
||||||
- ${DOCKER_WORKER_PROFILE:-}
|
- ${DOCKER_WORKER_PROFILE:-}
|
||||||
stop_signal: SIGTERM
|
|
||||||
build:
|
build:
|
||||||
target: ${DOCKER_APP_RUNTIME}-runtime
|
target: ${DOCKER_APP_RUNTIME}-runtime
|
||||||
cache_from:
|
cache_from:
|
||||||
|
@ -128,11 +136,17 @@ services:
|
||||||
PHP_EXTENSIONS_EXTRA: "${DOCKER_APP_PHP_EXTENSIONS_EXTRA:-}"
|
PHP_EXTENSIONS_EXTRA: "${DOCKER_APP_PHP_EXTENSIONS_EXTRA:-}"
|
||||||
PHP_PECL_EXTENSIONS_EXTRA: "${DOCKER_APP_PHP_PECL_EXTENSIONS_EXTRA:-}"
|
PHP_PECL_EXTENSIONS_EXTRA: "${DOCKER_APP_PHP_PECL_EXTENSIONS_EXTRA:-}"
|
||||||
PHP_VERSION: "${DOCKER_APP_PHP_VERSION:?error}"
|
PHP_VERSION: "${DOCKER_APP_PHP_VERSION:?error}"
|
||||||
|
environment:
|
||||||
|
# Used by Pixelfed Docker init script
|
||||||
|
DOCKER_SERVICE_NAME: "worker"
|
||||||
|
DOCKER_APP_ENTRYPOINT_DEBUG: ${DOCKER_APP_ENTRYPOINT_DEBUG:-0}
|
||||||
|
ENTRYPOINT_SKIP_SCRIPTS: ${ENTRYPOINT_SKIP_SCRIPTS:-}
|
||||||
volumes:
|
volumes:
|
||||||
- "./.env:/var/www/.env"
|
- "./.env:/var/www/.env"
|
||||||
|
- "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/conf.d:/docker/shared/proxy/conf.d"
|
||||||
- "${DOCKER_APP_HOST_CACHE_PATH}:/var/www/bootstrap/cache"
|
- "${DOCKER_APP_HOST_CACHE_PATH}:/var/www/bootstrap/cache"
|
||||||
- "${DOCKER_APP_HOST_STORAGE_PATH}:/var/www/storage"
|
|
||||||
- "${DOCKER_APP_HOST_OVERRIDES_PATH}:/docker/overrides:ro"
|
- "${DOCKER_APP_HOST_OVERRIDES_PATH}:/docker/overrides:ro"
|
||||||
|
- "${DOCKER_APP_HOST_STORAGE_PATH}:/var/www/storage"
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
|
@ -186,9 +200,9 @@ services:
|
||||||
image: redis:${DOCKER_REDIS_VERSION}
|
image: redis:${DOCKER_REDIS_VERSION}
|
||||||
container_name: "${DOCKER_ALL_CONTAINER_NAME_PREFIX}-redis"
|
container_name: "${DOCKER_ALL_CONTAINER_NAME_PREFIX}-redis"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
command: "${DOCKER_REDIS_CONFIG_FILE:-} --requirepass '${REDIS_PASSWORD:-}'"
|
||||||
profiles:
|
profiles:
|
||||||
- ${DOCKER_REDIS_PROFILE:-}
|
- ${DOCKER_REDIS_PROFILE:-}
|
||||||
command: "${DOCKER_REDIS_CONFIG_FILE:-} --requirepass '${REDIS_PASSWORD:-}'"
|
|
||||||
environment:
|
environment:
|
||||||
TZ: "${TZ:?error}"
|
TZ: "${TZ:?error}"
|
||||||
REDISCLI_AUTH: ${REDIS_PASSWORD:-}
|
REDISCLI_AUTH: ${REDIS_PASSWORD:-}
|
||||||
|
|
Loading…
Reference in a new issue