Skip to content

Commit e7a85c2

Browse files
committed
ci(Makefile.postgresql): replaced all docker-compose commands with docker compose (v2 plugin syntax)
Fix the execution in the github actions runner: The GitHub Actions runner has docker compose (v2 plugin) but not the standalone docker-compose (v1)
1 parent fb04f8f commit e7a85c2

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

docker/Makefile.postgresql

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -137,32 +137,32 @@ PG_DOCKER_DB_PASSWORD ?= postgres
137137

138138
# Build Docker image with pre-installed extension
139139
postgres-docker-build:
140-
@echo "Building Docker image via docker-compose (rebuilt when sources change)..."
140+
@echo "Building Docker image via docker compose (rebuilt when sources change)..."
141141
# To force plaintext BuildKit logs, run: make postgres-docker-build DOCKER_BUILD_ARGS="--progress=plain"
142-
cd docker/postgresql && docker-compose build $(DOCKER_BUILD_ARGS)
142+
cd docker/postgresql && docker compose build $(DOCKER_BUILD_ARGS)
143143
@echo ""
144144
@echo "Docker image built successfully!"
145145

146146
# Build Docker image with AddressSanitizer enabled (override compose file)
147147
postgres-docker-build-asan:
148-
@echo "Building Docker image with ASAN via docker-compose..."
148+
@echo "Building Docker image with ASAN via docker compose..."
149149
# To force plaintext BuildKit logs, run: make postgres-docker-build-asan DOCKER_BUILD_ARGS=\"--progress=plain\"
150-
cd docker/postgresql && docker-compose -f docker-compose.debug.yml -f docker-compose.asan.yml build $(DOCKER_BUILD_ARGS)
150+
cd docker/postgresql && docker compose -f docker-compose.debug.yml -f docker-compose.asan.yml build $(DOCKER_BUILD_ARGS)
151151
@echo ""
152152
@echo "ASAN Docker image built successfully!"
153153

154154
# Build Docker image using docker-compose.debug.yml
155155
postgres-docker-debug-build:
156-
@echo "Building debug Docker image via docker-compose..."
156+
@echo "Building debug Docker image via docker compose..."
157157
# To force plaintext BuildKit logs, run: make postgres-docker-debug-build DOCKER_BUILD_ARGS=\"--progress=plain\"
158-
cd docker/postgresql && docker-compose -f docker-compose.debug.yml build $(DOCKER_BUILD_ARGS)
158+
cd docker/postgresql && docker compose -f docker-compose.debug.yml build $(DOCKER_BUILD_ARGS)
159159
@echo ""
160160
@echo "Debug Docker image built successfully!"
161161

162162
# Run PostgreSQL container with CloudSync
163163
postgres-docker-run:
164164
@echo "Starting PostgreSQL with CloudSync..."
165-
cd docker/postgresql && docker-compose up -d --build
165+
cd docker/postgresql && docker compose up -d --build
166166
@echo ""
167167
@echo "Container started successfully!"
168168
@echo ""
@@ -179,7 +179,7 @@ postgres-docker-run:
179179
# Run PostgreSQL container with CloudSync and AddressSanitizer enabled
180180
postgres-docker-run-asan:
181181
@echo "Starting PostgreSQL with CloudSync (ASAN enabled)..."
182-
cd docker/postgresql && docker-compose -f docker-compose.debug.yml -f docker-compose.asan.yml up -d --build
182+
cd docker/postgresql && docker compose -f docker-compose.debug.yml -f docker-compose.asan.yml up -d --build
183183
@echo ""
184184
@echo "Container started successfully!"
185185
@echo ""
@@ -196,7 +196,7 @@ postgres-docker-run-asan:
196196
# Run PostgreSQL container using docker-compose.debug.yml
197197
postgres-docker-debug-run:
198198
@echo "Starting PostgreSQL with CloudSync (debug compose)..."
199-
cd docker/postgresql && docker-compose -f docker-compose.debug.yml up -d --build
199+
cd docker/postgresql && docker compose -f docker-compose.debug.yml up -d --build
200200
@echo ""
201201
@echo "Container started successfully!"
202202
@echo ""
@@ -213,21 +213,21 @@ postgres-docker-debug-run:
213213
# Stop PostgreSQL container
214214
postgres-docker-stop:
215215
@echo "Stopping PostgreSQL container..."
216-
cd docker/postgresql && docker-compose down
216+
cd docker/postgresql && docker compose down
217217
@echo "Container stopped"
218218

219219
# Rebuild and restart container
220220
postgres-docker-rebuild: postgres-docker-build
221221
@echo "Rebuilding and restarting container..."
222-
cd docker/postgresql && docker-compose down
223-
cd docker/postgresql && docker-compose up -d --build
222+
cd docker/postgresql && docker compose down
223+
cd docker/postgresql && docker compose up -d --build
224224
@echo "Container restarted with new image"
225225

226226
# Rebuild and restart container using docker-compose.debug.yml
227227
postgres-docker-debug-rebuild: postgres-docker-debug-build
228228
@echo "Rebuilding and restarting debug container..."
229-
cd docker/postgresql && docker-compose -f docker-compose.debug.yml down
230-
cd docker/postgresql && docker-compose -f docker-compose.debug.yml up -d --build
229+
cd docker/postgresql && docker compose -f docker-compose.debug.yml down
230+
cd docker/postgresql && docker compose -f docker-compose.debug.yml up -d --build
231231
@echo "Debug container restarted with new image"
232232

233233
# Interactive shell in container
@@ -353,5 +353,5 @@ postgres-help:
353353
# Simple smoke test: rebuild image/container, create extension, and query version
354354
unittest-pg: postgres-docker-rebuild
355355
@echo "Running PostgreSQL extension smoke test..."
356-
cd docker/postgresql && docker-compose exec -T postgres psql -U postgres -d cloudsync_test -f /tmp/cloudsync/docker/postgresql/smoke_test.sql
356+
cd docker/postgresql && docker compose exec -T postgres psql -U postgres -d cloudsync_test -f /tmp/cloudsync/docker/postgresql/smoke_test.sql
357357
@echo "Smoke test completed."

0 commit comments

Comments
 (0)