UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 06:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup a bit

Browse source
This commit is contained in:
Christian Winther 2024-01-15 14:42:54 +00:00
parent 84c9aeb514
commit c258a15761
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.env.docker
View file

@ -929,16 +929,10 @@ DOCKER_REDIS_PORT_EXTERNAL="${REDIS_PORT}"
DOCKER_DB_PORT_EXTERNAL="${DB_PORT}" DOCKER_DB_PORT_EXTERNAL="${DB_PORT}"
# Port that the web will listen on *outside* the container (e.g. the host machine) for HTTP traffic # Port that the web will listen on *outside* the container (e.g. the host machine) for HTTP traffic
DOCKER_WEB_HTTP_PORT_EXTERNAL="8080" DOCKER_PROXY_PORT_EXTERNAL_HTTP="80"
# Port that the web will listen on *outside* the container (e.g. the host machine) for HTTPS traffic # Port that the web will listen on *outside* the container (e.g. the host machine) for HTTPS traffic
DOCKER_WEB_HTTPS_PORT_EXTERNAL="444" DOCKER_PROXY_PORT_EXTERNAL_HTTPS="443"
# Port that the web will listen on *outside* the container (e.g. the host machine) for HTTP traffic
DOCKER_PROXY_PORT_EXTERNAL_HTTP="8080"
# Port that the web will listen on *outside* the container (e.g. the host machine) for HTTPS traffic
DOCKER_PROXY_PORT_EXTERNAL_HTTPS="444"
# Path to the Docker socket on the *host* # Path to the Docker socket on the *host*
DOCKER_HOST_SOCKET_PATH="/var/run/docker.sock" DOCKER_HOST_SOCKET_PATH="/var/run/docker.sock"

7
docker-compose.yml
View file

@ -12,7 +12,7 @@ services:
proxy: proxy:
image: nginxproxy/nginx-proxy:1.4 image: nginxproxy/nginx-proxy:1.4
container_name: "${DOCKER_CONTAINER_NAME_PREFIX}-proxy" container_name: "${DOCKER_CONTAINER_NAME_PREFIX}-proxy"
#restart: unless-stopped restart: unless-stopped
volumes: volumes:
- "${DOCKER_HOST_SOCKET_PATH}:/tmp/docker.sock:ro" - "${DOCKER_HOST_SOCKET_PATH}:/tmp/docker.sock:ro"
- "${DOCKER_CONFIG_ROOT}/proxy/conf.d:/etc/nginx/conf.d" - "${DOCKER_CONFIG_ROOT}/proxy/conf.d:/etc/nginx/conf.d"
@ -29,7 +29,7 @@ services:
proxy-acme: proxy-acme:
image: nginxproxy/acme-companion image: nginxproxy/acme-companion
container_name: "${DOCKER_CONTAINER_NAME_PREFIX}-proxy-acme" container_name: "${DOCKER_CONTAINER_NAME_PREFIX}-proxy-acme"
#restart: unless-stopped restart: unless-stopped
environment: environment:
DEBUG: 0 DEBUG: 0
DEFAULT_EMAIL: "${LETSENCRYPT_EMAIL}" DEFAULT_EMAIL: "${LETSENCRYPT_EMAIL}"
@ -67,9 +67,6 @@ services:
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
com.github.nginx-proxy.nginx-proxy.http3.enable: true com.github.nginx-proxy.nginx-proxy.http3.enable: true
# ports:
# - "${DOCKER_WEB_HTTP_PORT_EXTERNAL}:80"
# - "${DOCKER_WEB_HTTPS_PORT_EXTERNAL}:443"
depends_on: depends_on:
- db - db
- redis - redis