Skip to content

Commit

Permalink
fix: fix makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
tushar5526 committed Jul 12, 2023
1 parent 9021ec5 commit db4bca6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.PHONY: test

test:
wget https://github.com/SamagraX-RCW/identity/raw/main/vault/vault.json
wget -qO- https://github.com/SamagraX-RCW/identity/raw/main/build/setup_vault_gha.sh | bash -s -- docker-compose-test.yml vault-test
wget --no-clobber https://github.com/SamagraX-RCW/identity/raw/main/vault/vault.json
wget --no-clobber https://github.com/SamagraX-RCW/identity/raw/main/build/setup_vault_gha.sh
bash setup_vault_gha.sh docker-compose-test.yml vault-test
docker-compose -f docker-compose-test.yml up -d identity-service-test
docker-compose -f docker-compose-test.yml up -d credential-schema-test --abort-on-container-exit
docker-compose -f docker-compose-test.yml up --abort-on-container-exit credential-schema-test
6 changes: 3 additions & 3 deletions docker-compose-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:
identity-service-test:
image: ghcr.io/samagrax-rcw/identity:latest
depends_on:
db-test:
identity-db-test:
condition: service_healthy
vault-test:
condition: service_healthy
Expand All @@ -47,7 +47,7 @@ services:
VAULT_ADDR: "http://vault-test:8200"
# This will be replaced automatically on initialisation
# make compose-init will call setup_vault.sh
VAULT_TOKEN: hvs.dOLOfZJe5HJW1LBgQLCnW3YU
VAULT_TOKEN: hvs.WccBWI4moN6WL3Cg64GYW3zi
VAULT_BASE_URL: "http://vault-test:8200/v1"
VAULT_ROOT_PATH: "http://vault-test:8200/v1/kv"
VAULT_TIMEOUT: 5000
Expand Down Expand Up @@ -88,7 +88,7 @@ services:
condition: service_healthy
environment:
DATABASE_URL: postgres://postgres:postgres@db-test:5432/postgres
IDENTITY_BASE_URL: "http://identity-service:3332"
IDENTITY_BASE_URL: "http://identity-service-test:3332"
ENABLE_AUTH: "false"
networks:
test:
Expand Down

0 comments on commit db4bca6

Please sign in to comment.