diff --git a/.circleci/api-load-test.sh b/.circleci/api-load-test.sh index f5f5dc805a..5ef1fdfee6 100755 --- a/.circleci/api-load-test.sh +++ b/.circleci/api-load-test.sh @@ -22,7 +22,7 @@ readonly MARQUEZ_HOST="localhost" readonly MARQUEZ_ADMIN_PORT=8081 readonly MARQUEZ_URL="http://${MARQUEZ_HOST}:${MARQUEZ_ADMIN_PORT}" readonly MARQUEZ_DB="marquez-db" -readonly DB_PORT=5432 +readonly POSTGRES_PORT=5432 readonly METADATA_FILE="api/load-testing/metadata.json" readonly METADATA_STATS_QUERY=$(cat <<-END diff --git a/.env.example b/.env.example index bd9a02db22..1f9f77aa36 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,5 @@ API_PORT=5000 API_ADMIN_PORT=5001 WEB_PORT=3000 +DB_PORT=5432 TAG=0.45.0-rc.1 diff --git a/docker-compose.db.yml b/docker-compose.db.yml index 462d509301..f23df32550 100644 --- a/docker-compose.db.yml +++ b/docker-compose.db.yml @@ -4,7 +4,7 @@ services: image: postgres:14 container_name: marquez-db ports: - - "${DB_PORT}:${DB_PORT}" + - "${POSTGRES_PORT}:${POSTGRES_PORT}" environment: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=password diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index a4a53959ad..ca6d9a3222 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -12,4 +12,4 @@ services: ports: - "8080:8080" environment: - DATABASE_URL: postgres://postgres:password@db:${DB_PORT} + DATABASE_URL: postgres://postgres:password@db:${POSTGRES_PORT} diff --git a/docker-compose.yml b/docker-compose.yml index 44eebd44f9..073f82b3fc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,13 +15,13 @@ services: - "db:postgres" depends_on: - db - ENTRYPOINT /opt/marquez/wait-for-it.sh db:${DB_PORT} -- ./entrypoint.sh + ENTRYPOINT /opt/marquez/wait-for-it.sh db:${POSTGRES_PORT} -- ./entrypoint.sh db: image: postgres:14 container_name: marquez-db ports: - - "2345:2345" + - "${POSTGRES_PORT}:${POSTGRES_PORT}" environment: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=password diff --git a/docker/up.sh b/docker/up.sh index a4e9cf2d0c..06efa71514 100755 --- a/docker/up.sh +++ b/docker/up.sh @@ -64,7 +64,7 @@ compose_files="-f docker-compose.yml" API_PORT=5000 API_ADMIN_PORT=5001 WEB_PORT=3000 -DB_PORT=5432 +POSTGRES_PORT=5432 NO_WEB="false" NO_VOLUMES="false" TAG="${VERSION}" diff --git a/marquez.dev.yml b/marquez.dev.yml index c102c2d28a..eb3f5954c2 100644 --- a/marquez.dev.yml +++ b/marquez.dev.yml @@ -9,7 +9,7 @@ server: db: driverClass: org.postgresql.Driver - url: jdbc:postgresql://postgres:${DB_PORT}/marquez + url: jdbc:postgresql://postgres:${POSTGRES_PORT}/marquez user: marquez password: marquez