Refactor makefile to separate loadenvs command in deploy-test target

This commit is contained in:
2024-06-04 18:28:51 +08:00
parent 2a8bfd86d0
commit 0b164d534c
2 changed files with 12 additions and 7 deletions
+9 -1
View File
@@ -14,13 +14,21 @@ pull:
@echo "Pulling the project..." @echo "Pulling the project..."
git pull git pull
deploy-services: pull
@echo "Deploying the services stack..."
$(loadenvs ./swarm/.env) && docker stack deploy --compose-file ./swarm/services.yml services
deploy-apps: pull deploy-apps: pull
@echo "Deploying the apps stack..." @echo "Deploying the apps stack..."
$(loadenvs ./swarm/.env) && docker stack deploy --compose-file ./swarm/apps.yml apps $(loadenvs ./swarm/.env) && docker stack deploy --compose-file ./swarm/apps.yml apps
deploy-ghost: pull
@echo "Deploying the ghost stack..."
$(loadenvs ./swarm/.env)
docker stack deploy --compose-file ./swarm/ghost.yml ghost
deploy-test: pull deploy-test: pull
@echo "Deploying the apps stack..." @echo "Deploying the test stack..."
$(loadenvs ./swarm/.env) $(loadenvs ./swarm/.env)
docker stack deploy --compose-file ./swarm/thelounge.yml thelounge docker stack deploy --compose-file ./swarm/thelounge.yml thelounge
# git submodule update --init --recursive # git submodule update --init --recursive
+3 -6
View File
@@ -1,6 +1,3 @@
volumes:
ghost_content: {}
ghost_mysql: {}
networks: networks:
ghost: ghost:
driver: overlay driver: overlay
@@ -18,7 +15,7 @@ services:
environment: environment:
MYSQL_ROOT_PASSWORD: ${POSTGRES_PASSWORD} MYSQL_ROOT_PASSWORD: ${POSTGRES_PASSWORD}
volumes: volumes:
- ghost_mysql:/var/lib/mysql - /var/data/ghost_mysql:/var/lib/mysql
expose: expose:
- 3306 - 3306
networks: networks:
@@ -42,7 +39,7 @@ services:
database__connection__database: ghost database__connection__database: ghost
DOMAIN: https://ghost.${DOMAIN} DOMAIN: https://ghost.${DOMAIN}
volumes: volumes:
- ghost_content:/var/lib/ghost/content - /var/data/ghost_content:/var/lib/ghost/content
expose: expose:
- 2368 - 2368
networks: networks:
@@ -50,9 +47,9 @@ services:
- traefik-public - traefik-public
deploy: deploy:
labels: labels:
- traefik.enable=true
- traefik.docker.network=traefik-public - traefik.docker.network=traefik-public
- traefik.constraint-label=traefik-public - traefik.constraint-label=traefik-public
- traefik.enable=true
- traefik.http.routers.ghost.entrypoints=https - traefik.http.routers.ghost.entrypoints=https
- traefik.http.routers.ghost.rule=Host(`ghost.${DOMAIN}`) - traefik.http.routers.ghost.rule=Host(`ghost.${DOMAIN}`)
- traefik.http.routers.ghost.tls.certresolver=le - traefik.http.routers.ghost.tls.certresolver=le