Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use compose plugin of docker #859

Merged
merged 1 commit into from
Aug 2, 2024
+55 −55
Merged

Use compose plugin of docker #859

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/blobs/Makefile
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
test: down run down ;

run: build
docker-compose run test
docker compose run test

down:
docker-compose down
docker compose down

build:
docker-compose build --quiet
docker compose build --quiet

import:
psql --single-transaction --no-psqlrc -f import.sql
6 changes: 3 additions & 3 deletions tests/cdc-endpos-between-transaction/Makefile
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
test: down run down ;

run: build
docker-compose run test
docker compose run test

down:
docker-compose down
docker compose down

build:
docker-compose build --quiet
docker compose build --quiet

.PHONY: run down build test
6 changes: 3 additions & 3 deletions tests/cdc-low-level/Makefile
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
test: down run down ;

run: build
docker-compose run test
docker compose run test

down:
docker-compose down
docker compose down

build:
docker-compose build --quiet
docker compose build --quiet

.PHONY: run down build test
6 changes: 3 additions & 3 deletions tests/cdc-test-decoding/Makefile
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
test: down run down ;

run: build
docker-compose run test
docker compose run test

down:
docker-compose down
docker compose down

build:
docker-compose build --quiet
docker compose build --quiet

.PHONY: run down build test
8 changes: 4 additions & 4 deletions tests/cdc-wal2json/Makefile
View file
Original file line number Diff line number Diff line change
@@ -6,15 +6,15 @@ COMPOSE_EXIT = --exit-code-from=test --abort-on-container-exit
test: down run down ;

up: down build
docker-compose up $(COMPOSE_EXIT)
docker compose up $(COMPOSE_EXIT)

run: build
docker-compose run test
docker compose run test

down:
docker-compose down
docker compose down

build:
docker-compose build --quiet
docker compose build --quiet

.PHONY: run down build test
6 changes: 3 additions & 3 deletions tests/endpos-in-multi-wal-txn/Makefile
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
test: down run down ;

run: build
docker-compose run test
docker compose run test

down:
docker-compose down
docker compose down

build:
docker-compose build --quiet
docker compose build --quiet

.PHONY: run down build test
6 changes: 3 additions & 3 deletions tests/extensions/Makefile
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
test: down run down ;

run: build
docker-compose run test
docker compose run test

down:
docker-compose down
docker compose down

build:
docker-compose build --quiet
docker compose build --quiet

.PHONY: run down build test
6 changes: 3 additions & 3 deletions tests/filtering/Makefile
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
test: down run down ;

run: build
docker-compose run test
docker compose run test

down:
docker-compose down
docker compose down

build:
docker-compose build --quiet
docker compose build --quiet

.PHONY: run down build test
8 changes: 4 additions & 4 deletions tests/follow-9.6/Makefile
View file
Original file line number Diff line number Diff line change
@@ -7,16 +7,16 @@ COMPOSE_EXIT = --exit-code-from=test --abort-on-container-exit
test: down run down ;

up: down build
PGVERSION=$(PGVERSION) docker-compose up $(COMPOSE_EXIT)
PGVERSION=$(PGVERSION) docker compose up $(COMPOSE_EXIT)

run: build
PGVERSION=$(PGVERSION) docker-compose run test
PGVERSION=$(PGVERSION) docker compose run test

down:
docker-compose down
docker compose down
rm -rf workdir/pgcopydb

build:
PGVERSION=$(PGVERSION) docker-compose build
PGVERSION=$(PGVERSION) docker compose build

.PHONY: run down build test
2 changes: 1 addition & 1 deletion tests/follow-9.6/inject.sh
View file
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ pgcopydb stream sentinel set endpos --current
pgcopydb stream sentinel get

#
# Becaure we're using docker-compose --abort-on-container-exit make sure
# Becaure we're using docker compose --abort-on-container-exit make sure
# that the other process in the pgcopydb service is done before exiting
# here.
#
8 changes: 4 additions & 4 deletions tests/follow-data-only/Makefile
View file
Original file line number Diff line number Diff line change
@@ -6,16 +6,16 @@ COMPOSE_EXIT = --exit-code-from=test --abort-on-container-exit
test: down run down ;

up: down build
docker-compose up $(COMPOSE_EXIT)
docker compose up $(COMPOSE_EXIT)

run: build
docker-compose run test
docker compose run test

down:
docker-compose down
docker compose down
rm -rf workdir/pgcopydb

build:
docker-compose build --quiet
docker compose build --quiet

.PHONY: run down build test
2 changes: 1 addition & 1 deletion tests/follow-data-only/inject.sh
View file
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ pgcopydb stream sentinel set endpos --current
pgcopydb stream sentinel get

#
# Becaure we're using docker-compose --abort-on-container-exit make sure
# Becaure we're using docker compose --abort-on-container-exit make sure
# that the other process in the pgcopydb service is done before exiting
# here.
#
8 changes: 4 additions & 4 deletions tests/follow-wal2json/Makefile
View file
Original file line number Diff line number Diff line change
@@ -6,16 +6,16 @@ COMPOSE_EXIT = --exit-code-from=test --abort-on-container-exit
test: down run down ;

up: down build
docker-compose up $(COMPOSE_EXIT)
docker compose up $(COMPOSE_EXIT)

run: build
docker-compose run test
docker compose run test

down:
docker-compose down
docker compose down
rm -rf workdir/pgcopydb

build:
docker-compose build --quiet
docker compose build --quiet

.PHONY: run down build test
2 changes: 1 addition & 1 deletion tests/follow-wal2json/inject.sh
View file
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ pgcopydb stream sentinel set endpos --current
pgcopydb stream sentinel get

#
# Becaure we're using docker-compose --abort-on-container-exit make sure
# Becaure we're using docker compose --abort-on-container-exit make sure
# that the other process in the pgcopydb service is done before exiting
# here.
#
6 changes: 3 additions & 3 deletions tests/pagila-multi-steps/Makefile
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
test: down run down ;

run: build
docker-compose run test
docker compose run test

down:
docker-compose down
docker compose down

build:
docker-compose build --quiet
docker compose build --quiet

.PHONY: run down build test
2 changes: 1 addition & 1 deletion tests/pagila-standby/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# that image is built by docker-compose build: project-service
# that image is built by docker compose build: project-service
FROM pagila

COPY --from=pgcopydb /usr/local/bin/pgcopydb /usr/local/bin
6 changes: 3 additions & 3 deletions tests/pagila-standby/Makefile
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
test: down run down ;

run: build
docker-compose run test
docker compose run test

down:
docker-compose down
docker compose down

build:
docker-compose build --quiet
docker compose build --quiet

.PHONY: down build test
2 changes: 1 addition & 1 deletion tests/pagila/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# that image is built by docker-compose build: project-service
# that image is built by docker compose build: project-service
FROM pagila

COPY --from=pgcopydb /usr/local/bin/pgcopydb /usr/local/bin
6 changes: 3 additions & 3 deletions tests/pagila/Makefile
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
test: down run down ;

run: build
docker-compose run test
docker compose run test

down:
docker-compose down
docker compose down

build:
docker-compose build --quiet
docker compose build --quiet

.PHONY: down build test
2 changes: 1 addition & 1 deletion tests/unit/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# that image is built by docker-compose build: project-service
# that image is built by docker compose build: project-service
FROM pagila

WORKDIR /usr/src/pgcopydb
6 changes: 3 additions & 3 deletions tests/unit/Makefile
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
test: down run down ;

run: build
docker-compose run test
docker compose run test

down:
docker-compose down
docker compose down

build:
docker-compose build --quiet
docker compose build --quiet

.PHONY: run down build test