diff --git a/.env b/.env index d711639..313784f 100644 --- a/.env +++ b/.env @@ -41,5 +41,5 @@ POSTGRES_PASSWORD=changethis SENTRY_DSN= # Configure these with your own Docker registry images -DOCKER_IMAGE_BACKEND=docker.io/furyhawk/${STACK_NAME?Variable not set}-backend -DOCKER_IMAGE_FRONTEND=docker.io/furyhawk/${STACK_NAME?Variable not set}-frontend +DOCKER_IMAGE_BACKEND=docker.io/furyhawk/home-stack-fastapi-project-backend +DOCKER_IMAGE_FRONTEND=docker.io/furyhawk/home-stack-fastapi-project-frontend diff --git a/docker-compose.yml b/docker-compose.yml index 5ceacde..11be345 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,17 +33,17 @@ services: - traefik.enable=true - traefik.docker.network=traefik-public - traefik.constraint-label=traefik-public - - traefik.http.routers.${STACK_NAME?Variable not set}-adminer-http.rule=Host(`adminer.${DOMAIN?Variable not set}`) - - traefik.http.routers.${STACK_NAME?Variable not set}-adminer-http.entrypoints=http - - traefik.http.routers.${STACK_NAME?Variable not set}-adminer-http.middlewares=https-redirect - - traefik.http.routers.${STACK_NAME?Variable not set}-adminer-https.rule=Host(`adminer.${DOMAIN?Variable not set}`) - - traefik.http.routers.${STACK_NAME?Variable not set}-adminer-https.entrypoints=https - - traefik.http.routers.${STACK_NAME?Variable not set}-adminer-https.tls=true - - traefik.http.routers.${STACK_NAME?Variable not set}-adminer-https.tls.certresolver=le - - traefik.http.services.${STACK_NAME?Variable not set}-adminer.loadbalancer.server.port=8080 + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-adminer-http.rule=Host(`adminer.${DOMAIN?Variable not set}`) + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-adminer-http.entrypoints=http + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-adminer-http.middlewares=https-redirect + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-adminer-https.rule=Host(`adminer.${DOMAIN?Variable not set}`) + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-adminer-https.entrypoints=https + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-adminer-https.tls=true + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-adminer-https.tls.certresolver=le + - traefik.http.services.${STACK_NAME:-home-stack-fastapi-project}-adminer.loadbalancer.server.port=8080 prestart: - image: '${DOCKER_IMAGE_BACKEND?Variable not set}:${TAG-latest}' + image: '${DOCKER_IMAGE_BACKEND:-docker.io/furyhawk/home-stack-fastapi-project-backend}:${TAG-latest}' build: context: ./backend networks: @@ -76,7 +76,7 @@ services: - SENTRY_DSN=${SENTRY_DSN} backend: - image: '${DOCKER_IMAGE_BACKEND?Variable not set}:${TAG-latest}' + image: '${DOCKER_IMAGE_BACKEND:-docker.io/furyhawk/home-stack-fastapi-project-backend}:${TAG-latest}' restart: always networks: - traefik-public @@ -121,21 +121,21 @@ services: - traefik.docker.network=traefik-public - traefik.constraint-label=traefik-public - - traefik.http.services.${STACK_NAME?Variable not set}-backend.loadbalancer.server.port=8000 + - traefik.http.services.${STACK_NAME:-home-stack-fastapi-project}-backend.loadbalancer.server.port=8000 - - traefik.http.routers.${STACK_NAME?Variable not set}-backend-http.rule=Host(`service.${DOMAIN?Variable not set}`) - - traefik.http.routers.${STACK_NAME?Variable not set}-backend-http.entrypoints=http + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-backend-http.rule=Host(`service.${DOMAIN?Variable not set}`) + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-backend-http.entrypoints=http - - traefik.http.routers.${STACK_NAME?Variable not set}-backend-https.rule=Host(`service.${DOMAIN?Variable not set}`) - - traefik.http.routers.${STACK_NAME?Variable not set}-backend-https.entrypoints=https - - traefik.http.routers.${STACK_NAME?Variable not set}-backend-https.tls=true - - traefik.http.routers.${STACK_NAME?Variable not set}-backend-https.tls.certresolver=le + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-backend-https.rule=Host(`service.${DOMAIN?Variable not set}`) + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-backend-https.entrypoints=https + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-backend-https.tls=true + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-backend-https.tls.certresolver=le # Enable redirection for HTTP and HTTPS - - traefik.http.routers.${STACK_NAME?Variable not set}-backend-http.middlewares=https-redirect + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-backend-http.middlewares=https-redirect frontend: - image: '${DOCKER_IMAGE_FRONTEND?Variable not set}:${TAG-latest}' + image: '${DOCKER_IMAGE_FRONTEND:-docker.io/furyhawk/home-stack-fastapi-project-frontend}:${TAG-latest}' restart: always networks: - traefik-public @@ -150,18 +150,18 @@ services: - traefik.docker.network=traefik-public - traefik.constraint-label=traefik-public - - traefik.http.services.${STACK_NAME?Variable not set}-frontend.loadbalancer.server.port=80 + - traefik.http.services.${STACK_NAME:-home-stack-fastapi-project}-frontend.loadbalancer.server.port=80 - - traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=Host(`dashboard.${DOMAIN?Variable not set}`) - - traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.entrypoints=http + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-frontend-http.rule=Host(`dashboard.${DOMAIN?Variable not set}`) + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-frontend-http.entrypoints=http - - traefik.http.routers.${STACK_NAME?Variable not set}-frontend-https.rule=Host(`dashboard.${DOMAIN?Variable not set}`) - - traefik.http.routers.${STACK_NAME?Variable not set}-frontend-https.entrypoints=https - - traefik.http.routers.${STACK_NAME?Variable not set}-frontend-https.tls=true - - traefik.http.routers.${STACK_NAME?Variable not set}-frontend-https.tls.certresolver=le + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-frontend-https.rule=Host(`dashboard.${DOMAIN?Variable not set}`) + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-frontend-https.entrypoints=https + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-frontend-https.tls=true + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-frontend-https.tls.certresolver=le # Enable redirection for HTTP and HTTPS - - traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.middlewares=https-redirect + - traefik.http.routers.${STACK_NAME:-home-stack-fastapi-project}-frontend-http.middlewares=https-redirect volumes: app-db-data: