chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

update docs + paths

This commit is contained in:
Christian Winther 2024-02-22 15:24:51 +00:00
parent 2d8e81c83f
commit c8c2e1c2eb
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@ -98,7 +98,7 @@ services:
VIRTUAL_PORT: "80" VIRTUAL_PORT: "80"
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_ALL_HOST_CONFIG_ROOT_PATH}/proxy/conf.d:/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_OVERRIDES_PATH}:/docker/overrides:ro" - "${DOCKER_APP_HOST_OVERRIDES_PATH}:/docker/overrides:ro"
- "${DOCKER_APP_HOST_STORAGE_PATH}:/var/www/storage" - "${DOCKER_APP_HOST_STORAGE_PATH}:/var/www/storage"
@ -143,7 +143,7 @@ services:
ENTRYPOINT_SKIP_SCRIPTS: ${ENTRYPOINT_SKIP_SCRIPTS:-} 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_ALL_HOST_CONFIG_ROOT_PATH}/proxy/conf.d:/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_OVERRIDES_PATH}:/docker/overrides:ro" - "${DOCKER_APP_HOST_OVERRIDES_PATH}:/docker/overrides:ro"
- "${DOCKER_APP_HOST_STORAGE_PATH}:/var/www/storage" - "${DOCKER_APP_HOST_STORAGE_PATH}:/var/www/storage"

1
docker/shared/root/docker/entrypoint.d/01-permissions.sh
View File

@ -11,7 +11,6 @@ entrypoint-set-script-name "$0"
run-as-current-user chown --verbose "${RUNTIME_UID}:${RUNTIME_GID}" "./.env" run-as-current-user chown --verbose "${RUNTIME_UID}:${RUNTIME_GID}" "./.env"
run-as-current-user chown --verbose "${RUNTIME_UID}:${RUNTIME_GID}" "./bootstrap/cache" run-as-current-user chown --verbose "${RUNTIME_UID}:${RUNTIME_GID}" "./bootstrap/cache"
run-as-current-user chown --verbose "${RUNTIME_UID}:${RUNTIME_GID}" "./storage" run-as-current-user chown --verbose "${RUNTIME_UID}:${RUNTIME_GID}" "./storage"
run-as-current-user chown --verbose "${RUNTIME_UID}:${RUNTIME_GID}" "/docker/shared/proxy/conf.d"
run-as-current-user chown --verbose --recursive "${RUNTIME_UID}:${RUNTIME_GID}" "./storage/docker" run-as-current-user chown --verbose --recursive "${RUNTIME_UID}:${RUNTIME_GID}" "./storage/docker"
# Optionally fix ownership of configured paths # Optionally fix ownership of configured paths

5
docker/shared/root/docker/templates/docker/shared/proxy/conf.d/docker-pixelfed.conf → docker/shared/root/docker/templates/shared/proxy/conf.d/docker-pixelfed.conf
View File

@ -4,8 +4,9 @@
# This file is generated by the Pixelfed Docker setup, and # This file is generated by the Pixelfed Docker setup, and
# will be rewritten on every container start # will be rewritten on every container start
# #
# You can put any .conf file in this directory and it will be loaded # You can put any [.conf] file in this directory
# by nginx on startup. # (docker-compose-state/config/proxy/conf.d) and it will
# be loaded by nginx on startup.
# #
# Run [docker compose exec proxy bash -c 'nginx -t && nginx -s reload'] # Run [docker compose exec proxy bash -c 'nginx -t && nginx -s reload']
# to test your config and reload the proxy # to test your config and reload the proxy

0
docker/shared/root/shared/proxy/conf.d/.gitignore vendored Normal file
View File