fix: ci

sjtug · Aug 30, 2024 · 7b07390 · 7b07390
1 parent c063f5f
commit 7b07390
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -44,9 +44,9 @@ jobs:
           cp ./secrets/pg.env.example ./secrets/pg.env
           touch ./secrets/lug-secrets.sh
       - name: verify config
-        run: docker-compose -f docker-compose.yml -f docker-compose.${{ matrix.mirror }}.yml config
-      - name: docker-compose build
-        run: docker-compose -f docker-compose.yml -f docker-compose.${{ matrix.mirror }}.yml -f docker-compose.ci.yml build --parallel
+        run: docker compose -f docker-compose.yml -f docker-compose.${{ matrix.mirror }}.yml config
+      - name: docker compose build
+        run: docker compose -f docker-compose.yml -f docker-compose.${{ matrix.mirror }}.yml -f docker-compose.ci.yml build --parallel
       - name: validate Caddyfile
         run: make caddy-verify-config
   test-caddy-file:
@@ -73,7 +73,7 @@ jobs:
           cp ./secrets/pg.env.example ./secrets/pg.env
           touch ./secrets/lug-secrets.sh
       - name: validate Caddyfile
-        run: docker-compose build caddy && make caddy-verify-config
+        run: docker compose build caddy && make caddy-verify-config
   test-gateway-file:
     runs-on: ubuntu-latest
     name: rsync-gateway config up-to-date

diff --git a/Makefile b/Makefile
@@ -2,20 +2,20 @@ caddy-update-dist:
 	./scripts/download_latest_frontend.sh
 
 caddy-verify-config:
-	docker-compose run --rm caddy caddy validate --adapter caddyfile --config /etc/caddy/Caddyfile.siyuan
-	docker-compose run --rm caddy caddy validate --adapter caddyfile --config /etc/caddy/Caddyfile.zhiyuan
+	docker compose run --rm caddy caddy validate --adapter caddyfile --config /etc/caddy/Caddyfile.siyuan
+	docker compose run --rm caddy caddy validate --adapter caddyfile --config /etc/caddy/Caddyfile.zhiyuan
 
 caddy-gen:
 	cd caddy-gen && pipenv run python src/caddy-gen.py -i ../ -o ../caddy --site siyuan,zhiyuan
 
 caddy-hash-password:
-	docker-compose run --rm caddy caddy hash-password
+	docker compose run --rm caddy caddy hash-password
 
 caddy-gen-local:
 	cd caddy-gen && pipenv run python src/caddy-gen.py -i ../lug -o ../caddy --site local
 
 caddy-reload:
-	docker-compose exec -w /etc/caddy caddy caddy reload
+	docker compose exec -w /etc/caddy caddy caddy reload
 
 format-config: # You need to install prettier from npm to use this functionality
 	prettier *.yaml -w
@@ -27,21 +27,21 @@ gateway-gen:
 	cd gateway-gen && pipenv run python src/gateway-gen.py -i ../ -o ../rsync-gateway --site siyuan,zhiyuan
 
 up:
-	docker-compose up -d --build
+	docker compose up -d --build
 
 up-siyuan:
-	docker-compose -f docker-compose.yml -f docker-compose.siyuan.yml up -d --build
+	docker compose -f docker-compose.yml -f docker-compose.siyuan.yml up -d --build
 
 up-zhiyuan:
-	docker-compose -f docker-compose.yml -f docker-compose.zhiyuan.yml up -d --build
+	docker compose -f docker-compose.yml -f docker-compose.zhiyuan.yml up -d --build
 
 build-siyuan:
-	docker-compose -f docker-compose.yml -f docker-compose.siyuan.yml build
+	docker compose -f docker-compose.yml -f docker-compose.siyuan.yml build
 
 build-zhiyuan:
-	docker-compose -f docker-compose.yml -f docker-compose.zhiyuan.yml build
+	docker compose -f docker-compose.yml -f docker-compose.zhiyuan.yml build
 
 build:
-	docker-compose build
+	docker compose build
 
 .PHONY: caddy-gen gateway-gen integration-test