Merge branch 'build-windows-php' into new_dev

jingjingxyk · Jan 29, 2025 · fba2a76 · fba2a76
2 parents 20f7761 + 6e5f722
commit fba2a76
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml
@@ -210,8 +210,7 @@ jobs:
       - name: Start Database
         run: |
           # 准备数据库容器
-          export PATH=/usr/libexec/docker/cli-plugins/:$PATH
-          docker-compose version
+          docker compose version
           docker container ls -a
           bash sapi/docker/database/start.sh
 

diff --git a/sapi/docker/database/docker-compose.yaml b/sapi/docker/database/docker-compose.yaml
@@ -2,7 +2,6 @@ name: "database"
 services:
   postgresql-server:
     image: postgres:17-alpine
-    # image: postgis/postgis:16-3.4-alpine
     hostname: "postgresql"
     container_name: "postgresql"
     ports:

diff --git a/sapi/docker/database/start.sh b/sapi/docker/database/start.sh
@@ -8,8 +8,8 @@ __DIR__=$(
 
 cd ${__DIR__}
 
-docker-compose -f docker-compose.yaml up -d
-docker-compose -f docker-compose.yaml ps
+docker compose -f docker-compose.yaml up -d
+docker compose -f docker-compose.yaml ps
 
 docker container ls -a
 

diff --git a/sapi/docker/database/stop.sh b/sapi/docker/database/stop.sh
@@ -8,4 +8,4 @@ __DIR__=$(
 
 cd ${__DIR__}
 
-docker-compose -f docker-compose.yaml down --remove-orphans
+docker compose -f docker-compose.yaml down --remove-orphans
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,4 @@ __DIR__=$(

		cd ${__DIR__}

		docker-compose -f docker-compose.yaml down --remove-orphans
		docker compose -f docker-compose.yaml down --remove-orphans