Skip to content

Commit

Permalink
change docker-compose for docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
dhontecillas committed Nov 12, 2024
1 parent 46b5543 commit ab12d29
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ test:
.PHONY: test

dctest:
docker-compose -f docker-compose.test.yml up -d && sleep 4 && \
export TESTDB_PORT=$$(docker-compose -f docker-compose.test.yml port -- hfw_test_db 5432 | cut -d ':' -f 2) && \
export TESTREDIS_PORT=$$(docker-compose -f docker-compose.test.yml port -- hfw_test_redis 6279 | cut -d ':' -f 2) && \
docker compose -f docker-compose.test.yml up -d && sleep 4 && \
export TESTDB_PORT=$$(docker compose -f docker-compose.test.yml port -- hfw_test_db 5432 | cut -d ':' -f 2) && \
export TESTREDIS_PORT=$$(docker compose -f docker-compose.test.yml port -- hfw_test_redis 6279 | cut -d ':' -f 2) && \
docker run -v $$PWD/testing/migrations:/migrations --network host migrate/migrate -path=/migrations/ -database postgres://hfwtest:test@localhost:$$TESTDB_PORT/hfwtest?sslmode=disable up && \
export NOTIFICATIONS_TEMPLATES_DIR=$$(pwd)/pkg/notifications/templates && \
go test -coverprofile=coverage.out $(PACKAGES) ; \
export TEST_RESULT=$$? ; \
docker-compose -f docker-compose.test.yml down ; \
docker compose -f docker-compose.test.yml down ; \
exit $$TEST_RESULT


Expand All @@ -95,10 +95,10 @@ check: test lint
.PHONY: check

coverage: tools
docker-compose -f docker-compose.test.yml down; sleep 4; \
docker-compose -f docker-compose.test.yml up -d && sleep 4 && \
export TESTDB_PORT=$$(docker-compose -f docker-compose.test.yml port -- hfw_test_db 5432 | cut -d ':' -f 2) && \
export TESTREDIS_PORT=$$(docker-compose -f docker-compose.test.yml port -- hfw_test_redis 6279 | cut -d ':' -f 2) && \
docker compose -f docker-compose.test.yml down; sleep 4; \
docker compose -f docker-compose.test.yml up -d && sleep 4 && \
export TESTDB_PORT=$$(docker compose -f docker-compose.test.yml port -- hfw_test_db 5432 | cut -d ':' -f 2) && \
export TESTREDIS_PORT=$$(docker compose -f docker-compose.test.yml port -- hfw_test_redis 6279 | cut -d ':' -f 2) && \
docker run -v $$PWD/testing/migrations:/migrations --network host migrate/migrate -path=/migrations/ -database postgres://hfwtest:test@localhost:$$TESTDB_PORT/hfwtest?sslmode=disable up && \
export NOTIFICATIONS_TEMPLATES_DIR=$$(pwd)/pkg/notifications/templates && \
mkdir -p docs/coverage && \
Expand Down

0 comments on commit ab12d29

Please sign in to comment.