From 0595f3dc15474c1ceacc21ef33eeaaf18a7936cc Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Mon, 13 Mar 2023 21:35:58 +0800 Subject: [PATCH] Renames and clean up (#129) * Cerc refactor contd. * consistent local docker tag --- .github/workflows/publish.yaml | 4 +++- Makefile | 2 +- docker-compose.test.yml | 6 +++--- docker-compose.yml | 6 +++--- scripts/test_migration.sh | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 904f573..bad2a7b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -14,7 +14,9 @@ jobs: - name: Run docker build run: make docker-build - name: Tag docker image - run: docker tag vulcanize/ipld-eth-db docker.pkg.github.com/vulcanize/ipld-eth-db/ipld-eth-db:${{steps.vars.outputs.sha}} + run: docker tag cerc/ipld-eth-db git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:${{steps.vars.outputs.sha}} + - name: Tag docker image + run: docker tag git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:${{steps.vars.outputs.sha}} git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:${{steps.vars.outputs.tag}} - name: Docker Login run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin - name: Docker Push diff --git a/Makefile b/Makefile index 9b3367e..788b070 100644 --- a/Makefile +++ b/Makefile @@ -120,7 +120,7 @@ docker-build: # ## Build docker image for migration # .PHONY: docker-concise-migration-build # docker-concise-migration-build: -# docker build -t vulcanize/concise-migration-build -f ./db/Dockerfile . +# docker build -t cerc/concise-migration-build -f ./db/Dockerfile . .PHONY: test-migrations test-migrations: $(GOOSE) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 7669176..1f4edc8 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -5,12 +5,12 @@ services: restart: on-failure depends_on: - ipld-eth-db - image: vulcanize/ipld-eth-db + image: cerc/ipld-eth-db # Build image using local context build: . environment: DATABASE_USER: "vdbm" - DATABASE_NAME: "vulcanize_testing" + DATABASE_NAME: "cerc_testing" DATABASE_PASSWORD: "password" DATABASE_HOSTNAME: "ipld-eth-db" DATABASE_PORT: 5432 @@ -21,7 +21,7 @@ services: command: ["postgres", "-c", "log_statement=all"] environment: POSTGRES_USER: "vdbm" - POSTGRES_DB: "vulcanize_testing" + POSTGRES_DB: "cerc_testing" POSTGRES_PASSWORD: "password" ports: - "127.0.0.1:8077:5432" diff --git a/docker-compose.yml b/docker-compose.yml index 6e517c7..3018478 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,10 +6,10 @@ services: depends_on: - ipld-eth-db # Use an existing image - image: vulcanize/ipld-eth-db:v4.2.1-alpha + image: cerc/ipld-eth-db:v4.2.2-alpha environment: DATABASE_USER: "vdbm" - DATABASE_NAME: "vulcanize_testing" + DATABASE_NAME: "cerc_testing" DATABASE_PASSWORD: "password" DATABASE_HOSTNAME: "ipld-eth-db" DATABASE_PORT: 5432 @@ -20,7 +20,7 @@ services: command: ["postgres", "-c", "log_statement=all"] environment: POSTGRES_USER: "vdbm" - POSTGRES_DB: "vulcanize_testing" + POSTGRES_DB: "cerc_testing" POSTGRES_PASSWORD: "password" ports: - "127.0.0.1:8077:5432" diff --git a/scripts/test_migration.sh b/scripts/test_migration.sh index fe60b33..9fb8e9b 100755 --- a/scripts/test_migration.sh +++ b/scripts/test_migration.sh @@ -10,7 +10,7 @@ sleep 5s export HOST_NAME=localhost export PORT=8066 export USER=vdbm -export TEST_DB=vulcanize_testing +export TEST_DB=cerc_testing export TEST_CONNECT_STRING=postgresql://$USER@$HOST_NAME:$PORT/$TEST_DB?sslmode=disable export PGPASSWORD=password @@ -54,4 +54,4 @@ do then exit 0 fi -done \ No newline at end of file +done