nt_web_template/full-stack-fastapi-template
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

♻ Re-structure Docker Compose files, discard Docker Swarm specific logic (#607)

Browse Source
This commit is contained in:
Sebastián Ramírez
2024-02-25 17:28:26 +01:00
committed by GitHub
parent f41f4432fe
commit 72f835a6b4
2 changed files with 86 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/docker-compose.override.yml
View File

@@ -5,6 +5,7 @@ services:
ports: ports:
- "80:80" - "80:80"
- "8090:8080" - "8090:8080"
# Duplicate the command from docker-compose.yml to add --api.insecure=true
command: command:
# Enable Docker in Traefik, so that it reads labels from Docker services # Enable Docker in Traefik, so that it reads labels from Docker services
- --providers.docker - --providers.docker
@@ -13,8 +14,6 @@ services:
- --providers.docker.constraints=Label(`traefik.constraint-label-stack`, `${TRAEFIK_TAG?Variable not set}`) - --providers.docker.constraints=Label(`traefik.constraint-label-stack`, `${TRAEFIK_TAG?Variable not set}`)
# Do not expose all Docker services, only the ones explicitly exposed # Do not expose all Docker services, only the ones explicitly exposed
- --providers.docker.exposedbydefault=false - --providers.docker.exposedbydefault=false
# Disable Docker Swarm mode for local development
# - --providers.docker.swarmmode
# Enable the access log, with HTTP requests # Enable the access log, with HTTP requests
- --accesslog - --accesslog
# Enable the Traefik log, for configurations and errors # Enable the Traefik log, for configurations and errors
@@ -24,7 +23,6 @@ services:
# Enable the Dashboard and API in insecure mode for local development # Enable the Dashboard and API in insecure mode for local development
- --api.insecure=true - --api.insecure=true
labels: labels:
- traefik.enable=true
- traefik.http.routers.${STACK_NAME?Variable not set}-traefik-public-http.rule=Host(`${DOMAIN?Variable not set}`) - traefik.http.routers.${STACK_NAME?Variable not set}-traefik-public-http.rule=Host(`${DOMAIN?Variable not set}`)
- traefik.http.services.${STACK_NAME?Variable not set}-traefik-public.loadbalancer.server.port=80 - traefik.http.services.${STACK_NAME?Variable not set}-traefik-public.loadbalancer.server.port=80
@@ -36,13 +34,12 @@ services:
ports: ports:
- "5050:5050" - "5050:5050"
# Uncomment the section below to be able to debug locally queue:
# queue: ports:
# ports: - "5671:5671"
# - "5671:5671" - "5672:5672"
# - "5672:5672" - "15672:15672"
# - "15672:15672" - "15671:15671"
# - "15671:15671"
flower: flower:
ports: ports:
@@ -62,13 +59,8 @@ services:
args: args:
INSTALL_DEV: ${INSTALL_DEV-true} INSTALL_DEV: ${INSTALL_DEV-true}
INSTALL_JUPYTER: ${INSTALL_JUPYTER-true} INSTALL_JUPYTER: ${INSTALL_JUPYTER-true}
# command: bash -c "while true; do sleep 1; done" # Infinite loop to keep container live doing nothing # command: sleep infinity # Infinite loop to keep container alive doing nothing
command: /start-reload.sh command: /start-reload.sh
labels:
- traefik.enable=true
- traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set}
- traefik.http.routers.${STACK_NAME?Variable not set}-backend-http.rule=PathPrefix(`/api`) || PathPrefix(`/docs`) || PathPrefix(`/redoc`)
- traefik.http.services.${STACK_NAME?Variable not set}-backend.loadbalancer.server.port=80
celeryworker: celeryworker:
volumes: volumes:
@@ -90,20 +82,8 @@ services:
args: args:
FRONTEND_ENV: dev FRONTEND_ENV: dev
labels: labels:
- traefik.enable=true
- traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set}
# - traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=PathPrefix(`/`) # - traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=PathPrefix(`/`)
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=Host(`old-frontend.localhost.tiangolo.com`) - traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=Host(`old-frontend.localhost.tiangolo.com`)
- traefik.http.services.${STACK_NAME?Variable not set}-frontend.loadbalancer.server.port=80
# new-frontend:
# build:
# context: ./new-frontend
# labels:
# - traefik.enable=true
# - traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set}
# - traefik.http.routers.${STACK_NAME?Variable not set}-new-frontend-http.rule=PathPrefix(`/`)
# - traefik.http.services.${STACK_NAME?Variable not set}-new-frontend.loadbalancer.server.port=80
networks: networks:
traefik-public: traefik-public:

172
src/docker-compose.yml
View File

@@ -16,57 +16,51 @@ services:
- --providers.docker.constraints=Label(`traefik.constraint-label-stack`, `${TRAEFIK_TAG?Variable not set}`) - --providers.docker.constraints=Label(`traefik.constraint-label-stack`, `${TRAEFIK_TAG?Variable not set}`)
# Do not expose all Docker services, only the ones explicitly exposed # Do not expose all Docker services, only the ones explicitly exposed
- --providers.docker.exposedbydefault=false - --providers.docker.exposedbydefault=false
# Enable Docker Swarm mode
- --providers.docker.swarmmode
# Enable the access log, with HTTP requests # Enable the access log, with HTTP requests
- --accesslog - --accesslog
# Enable the Traefik log, for configurations and errors # Enable the Traefik log, for configurations and errors
- --log - --log
# Enable the Dashboard and API # Enable the Dashboard and API
- --api - --api
deploy: labels:
placement: # Enable Traefik for this service, to make it available in the public network
constraints: - traefik.enable=true
- node.role == manager # Use the traefik-public network (declared below)
labels: - traefik.docker.network=${TRAEFIK_PUBLIC_NETWORK?Variable not set}
# Enable Traefik for this service, to make it available in the public network # Use the custom label "traefik.constraint-label=traefik-public"
- traefik.enable=true # This public Traefik will only use services with this label
# Use the traefik-public network (declared below) - traefik.constraint-label=${TRAEFIK_PUBLIC_TAG?Variable not set}
- traefik.docker.network=${TRAEFIK_PUBLIC_NETWORK?Variable not set} # traefik-http set up only to use the middleware to redirect to https
# Use the custom label "traefik.constraint-label=traefik-public" - traefik.http.middlewares.${STACK_NAME?Variable not set}-https-redirect.redirectscheme.scheme=https
# This public Traefik will only use services with this label - traefik.http.middlewares.${STACK_NAME?Variable not set}-https-redirect.redirectscheme.permanent=true
- traefik.constraint-label=${TRAEFIK_PUBLIC_TAG?Variable not set} # Handle host with and without "www" to redirect to only one of them
# traefik-http set up only to use the middleware to redirect to https # Uses environment variable DOMAIN
- traefik.http.middlewares.${STACK_NAME?Variable not set}-https-redirect.redirectscheme.scheme=https # To disable www redirection remove the Host() you want to discard, here and
- traefik.http.middlewares.${STACK_NAME?Variable not set}-https-redirect.redirectscheme.permanent=true # below for HTTPS
# Handle host with and without "www" to redirect to only one of them - traefik.http.routers.${STACK_NAME?Variable not set}-proxy-http.rule=Host(`${DOMAIN?Variable not set}`) || Host(`www.${DOMAIN?Variable not set}`)
# Uses environment variable DOMAIN - traefik.http.routers.${STACK_NAME?Variable not set}-proxy-http.entrypoints=http
# To disable www redirection remove the Host() you want to discard, here and # traefik-https the actual router using HTTPS
# below for HTTPS - traefik.http.routers.${STACK_NAME?Variable not set}-proxy-https.rule=Host(`${DOMAIN?Variable not set}`) || Host(`www.${DOMAIN?Variable not set}`)
- traefik.http.routers.${STACK_NAME?Variable not set}-proxy-http.rule=Host(`${DOMAIN?Variable not set}`) || Host(`www.${DOMAIN?Variable not set}`) - traefik.http.routers.${STACK_NAME?Variable not set}-proxy-https.entrypoints=https
- traefik.http.routers.${STACK_NAME?Variable not set}-proxy-http.entrypoints=http - traefik.http.routers.${STACK_NAME?Variable not set}-proxy-https.tls=true
# traefik-https the actual router using HTTPS # Use the "le" (Let's Encrypt) resolver created below
- traefik.http.routers.${STACK_NAME?Variable not set}-proxy-https.rule=Host(`${DOMAIN?Variable not set}`) || Host(`www.${DOMAIN?Variable not set}`) - traefik.http.routers.${STACK_NAME?Variable not set}-proxy-https.tls.certresolver=le
- traefik.http.routers.${STACK_NAME?Variable not set}-proxy-https.entrypoints=https # Define the port inside of the Docker service to use
- traefik.http.routers.${STACK_NAME?Variable not set}-proxy-https.tls=true - traefik.http.services.${STACK_NAME?Variable not set}-proxy.loadbalancer.server.port=80
# Use the "le" (Let's Encrypt) resolver created below # Handle domain with and without "www" to redirect to only one
- traefik.http.routers.${STACK_NAME?Variable not set}-proxy-https.tls.certresolver=le # To disable www redirection remove the next line
# Define the port inside of the Docker service to use - traefik.http.middlewares.${STACK_NAME?Variable not set}-www-redirect.redirectregex.regex=^https?://(www.)?(${DOMAIN?Variable not set})/(.*)
- traefik.http.services.${STACK_NAME?Variable not set}-proxy.loadbalancer.server.port=80 # Redirect a domain with www to non-www
# Handle domain with and without "www" to redirect to only one # To disable it remove the next line
# To disable www redirection remove the next line - traefik.http.middlewares.${STACK_NAME?Variable not set}-www-redirect.redirectregex.replacement=https://${DOMAIN?Variable not set}/$${3}
- traefik.http.middlewares.${STACK_NAME?Variable not set}-www-redirect.redirectregex.regex=^https?://(www.)?(${DOMAIN?Variable not set})/(.*) # Redirect a domain without www to www
# Redirect a domain with www to non-www # To enable it remove the previous line and uncomment the next
# To disable it remove the next line # - traefik.http.middlewares.${STACK_NAME}-www-redirect.redirectregex.replacement=https://www.${DOMAIN}/$${3}
- traefik.http.middlewares.${STACK_NAME?Variable not set}-www-redirect.redirectregex.replacement=https://${DOMAIN?Variable not set}/$${3} # Middleware to redirect www, to disable it remove the next line
# Redirect a domain without www to www - traefik.http.routers.${STACK_NAME?Variable not set}-proxy-https.middlewares=${STACK_NAME?Variable not set}-www-redirect
# To enable it remove the previous line and uncomment the next # Middleware to redirect www, and redirect HTTP to HTTPS
# - traefik.http.middlewares.${STACK_NAME}-www-redirect.redirectregex.replacement=https://www.${DOMAIN}/$${3} # to disable www redirection remove the section: ${STACK_NAME?Variable not set}-www-redirect,
# Middleware to redirect www, to disable it remove the next line - traefik.http.routers.${STACK_NAME?Variable not set}-proxy-http.middlewares=${STACK_NAME?Variable not set}-www-redirect,${STACK_NAME?Variable not set}-https-redirect
- traefik.http.routers.${STACK_NAME?Variable not set}-proxy-https.middlewares=${STACK_NAME?Variable not set}-www-redirect
# Middleware to redirect www, and redirect HTTP to HTTPS
# to disable www redirection remove the section: ${STACK_NAME?Variable not set}-www-redirect,
- traefik.http.routers.${STACK_NAME?Variable not set}-proxy-http.middlewares=${STACK_NAME?Variable not set}-www-redirect,${STACK_NAME?Variable not set}-https-redirect
db: db:
image: postgres:12 image: postgres:12
@@ -76,10 +70,6 @@ services:
- .env - .env
environment: environment:
- PGDATA=/var/lib/postgresql/data/pgdata - PGDATA=/var/lib/postgresql/data/pgdata
deploy:
placement:
constraints:
- node.labels.${STACK_NAME?Variable not set}.app-db-data == true
pgadmin: pgadmin:
image: dpage/pgadmin4 image: dpage/pgadmin4
@@ -90,19 +80,18 @@ services:
- db - db
env_file: env_file:
- .env - .env
deploy: labels:
labels: - traefik.enable=true
- traefik.enable=true - traefik.docker.network=${TRAEFIK_PUBLIC_NETWORK?Variable not set}
- traefik.docker.network=${TRAEFIK_PUBLIC_NETWORK?Variable not set} - traefik.constraint-label=${TRAEFIK_PUBLIC_TAG?Variable not set}
- traefik.constraint-label=${TRAEFIK_PUBLIC_TAG?Variable not set} - traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-http.rule=Host(`pgadmin.${DOMAIN?Variable not set}`)
- traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-http.rule=Host(`pgadmin.${DOMAIN?Variable not set}`) - traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-http.entrypoints=http
- traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-http.entrypoints=http - traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-http.middlewares=${STACK_NAME?Variable not set}-https-redirect
- traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-http.middlewares=${STACK_NAME?Variable not set}-https-redirect - traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-https.rule=Host(`pgadmin.${DOMAIN?Variable not set}`)
- traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-https.rule=Host(`pgadmin.${DOMAIN?Variable not set}`) - traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-https.entrypoints=https
- traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-https.entrypoints=https - traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-https.tls=true
- traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-https.tls=true - traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-https.tls.certresolver=le
- traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-https.tls.certresolver=le - traefik.http.services.${STACK_NAME?Variable not set}-pgadmin.loadbalancer.server.port=5050
- traefik.http.services.${STACK_NAME?Variable not set}-pgadmin.loadbalancer.server.port=5050
queue: queue:
image: rabbitmq:3 image: rabbitmq:3
@@ -123,19 +112,18 @@ services:
# For the "Broker" tab to work in the flower UI, uncomment the following command argument, # For the "Broker" tab to work in the flower UI, uncomment the following command argument,
# and change the queue service's image as well # and change the queue service's image as well
# - "--broker_api=http://guest:guest@queue:15672/api//" # - "--broker_api=http://guest:guest@queue:15672/api//"
deploy: labels:
labels: - traefik.enable=true
- traefik.enable=true - traefik.docker.network=${TRAEFIK_PUBLIC_NETWORK?Variable not set}
- traefik.docker.network=${TRAEFIK_PUBLIC_NETWORK?Variable not set} - traefik.constraint-label=${TRAEFIK_PUBLIC_TAG?Variable not set}
- traefik.constraint-label=${TRAEFIK_PUBLIC_TAG?Variable not set} - traefik.http.routers.${STACK_NAME?Variable not set}-flower-http.rule=Host(`flower.${DOMAIN?Variable not set}`)
- traefik.http.routers.${STACK_NAME?Variable not set}-flower-http.rule=Host(`flower.${DOMAIN?Variable not set}`) - traefik.http.routers.${STACK_NAME?Variable not set}-flower-http.entrypoints=http
- traefik.http.routers.${STACK_NAME?Variable not set}-flower-http.entrypoints=http - traefik.http.routers.${STACK_NAME?Variable not set}-flower-http.middlewares=${STACK_NAME?Variable not set}-https-redirect
- traefik.http.routers.${STACK_NAME?Variable not set}-flower-http.middlewares=${STACK_NAME?Variable not set}-https-redirect - traefik.http.routers.${STACK_NAME?Variable not set}-flower-https.rule=Host(`flower.${DOMAIN?Variable not set}`)
- traefik.http.routers.${STACK_NAME?Variable not set}-flower-https.rule=Host(`flower.${DOMAIN?Variable not set}`) - traefik.http.routers.${STACK_NAME?Variable not set}-flower-https.entrypoints=https
- traefik.http.routers.${STACK_NAME?Variable not set}-flower-https.entrypoints=https - traefik.http.routers.${STACK_NAME?Variable not set}-flower-https.tls=true
- traefik.http.routers.${STACK_NAME?Variable not set}-flower-https.tls=true - traefik.http.routers.${STACK_NAME?Variable not set}-flower-https.tls.certresolver=le
- traefik.http.routers.${STACK_NAME?Variable not set}-flower-https.tls.certresolver=le - traefik.http.services.${STACK_NAME?Variable not set}-flower.loadbalancer.server.port=5555
- traefik.http.services.${STACK_NAME?Variable not set}-flower.loadbalancer.server.port=5555
backend: backend:
image: '${DOCKER_IMAGE_BACKEND?Variable not set}:${TAG-latest}' image: '${DOCKER_IMAGE_BACKEND?Variable not set}:${TAG-latest}'
@@ -153,12 +141,11 @@ services:
dockerfile: backend.dockerfile dockerfile: backend.dockerfile
args: args:
INSTALL_DEV: ${INSTALL_DEV-false} INSTALL_DEV: ${INSTALL_DEV-false}
deploy: labels:
labels: - traefik.enable=true
- traefik.enable=true - traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set}
- traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set} - traefik.http.routers.${STACK_NAME?Variable not set}-backend-http.rule=PathPrefix(`/api`) || PathPrefix(`/docs`) || PathPrefix(`/redoc`)
- traefik.http.routers.${STACK_NAME?Variable not set}-backend-http.rule=PathPrefix(`/api`) || PathPrefix(`/docs`) || PathPrefix(`/redoc`) - traefik.http.services.${STACK_NAME?Variable not set}-backend.loadbalancer.server.port=80
- traefik.http.services.${STACK_NAME?Variable not set}-backend.loadbalancer.server.port=80
celeryworker: celeryworker:
image: '${DOCKER_IMAGE_CELERYWORKER?Variable not set}:${TAG-latest}' image: '${DOCKER_IMAGE_CELERYWORKER?Variable not set}:${TAG-latest}'
@@ -184,24 +171,21 @@ services:
context: ./frontend context: ./frontend
args: args:
FRONTEND_ENV: ${FRONTEND_ENV-production} FRONTEND_ENV: ${FRONTEND_ENV-production}
deploy: labels:
labels: - traefik.enable=true
- traefik.enable=true - traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set}
- traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set} - traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=PathPrefix(`/`)
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=PathPrefix(`/`) - traefik.http.services.${STACK_NAME?Variable not set}-frontend.loadbalancer.server.port=80
- traefik.http.services.${STACK_NAME?Variable not set}-frontend.loadbalancer.server.port=80
# new-frontend: # new-frontend:
# image: '${DOCKER_IMAGE_NEW_FRONTEND?Variable not set}:${TAG-latest}' # image: '${DOCKER_IMAGE_NEW_FRONTEND?Variable not set}:${TAG-latest}'
# build: # build:
# context: ./new-frontend # context: ./new-frontend
# deploy: # labels:
# labels: # - traefik.enable=true
# - traefik.enable=true # - traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set}
# - traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set} # - traefik.http.routers.${STACK_NAME?Variable not set}-new-frontend-http.rule=PathPrefix(`/`)
# - traefik.http.routers.${STACK_NAME?Variable not set}-new-frontend-http.rule=PathPrefix(`/`) # - traefik.http.services.${STACK_NAME?Variable not set}-new-frontend.loadbalancer.server.port=80
# - traefik.http.services.${STACK_NAME?Variable not set}-new-frontend.loadbalancer.server.port=80
volumes: volumes:
app-db-data: app-db-data: