RA-141: Remove relative path from docker compose files (#176)

cardano-foundation · May 17, 2024 · 5a1c5e2 · 5a1c5e2
2 parents b12479c + 627877e
commit 5a1c5e2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/.env.IntegrationTest b/.env.IntegrationTest
@@ -18,7 +18,7 @@ DB_HOST=db
 # Service name in docker-compose or local db
 DB_PORT=5432
 DB_SCHEMA=${NETWORK}
-DB_PATH=/data
+DB_PATH=data
 UPDATE_GENESIS_BLOCK_QUERY="UPDATE devkit.block SET number = 0 WHERE number = -1; UPDATE devkit.block SET prev_hash = 'Genesis' WHERE number = 1"
 
 ## Cardano Node variables
@@ -32,7 +32,7 @@ CARDANO_NODE_VERSION=0.0.0
 CARDANO_NODE_SOCKET_PATH=/node
 CARDANO_NODE_SOCKET=${CARDANO_NODE_SOCKET_PATH}/node.socket
 CARDANO_NODE_DB=/node/db
-CARDANO_CONFIG=/config/${NETWORK}
+CARDANO_CONFIG=./config/${NETWORK}
 
 ## Api env
 API_DOCKER_IMAGE_TAG=main

diff --git a/.env.docker-compose b/.env.docker-compose
@@ -17,7 +17,7 @@ DB_HOST=db
 # Service name in docker-compose or local db
 DB_PORT=5432
 DB_SCHEMA=${NETWORK}
-DB_PATH=/data
+DB_PATH=data
 
 ## Cardano Node variables
 CARDANO_NODE_HOST=cardano-node
@@ -30,7 +30,7 @@ NODE_SUBMIT_API_PORT=8090
 CARDANO_NODE_SOCKET_PATH=/node
 CARDANO_NODE_SOCKET=${CARDANO_NODE_SOCKET_PATH}/node.socket
 CARDANO_NODE_DB=/node/db
-CARDANO_CONFIG=/config/${NETWORK}
+CARDANO_CONFIG=./config/${NETWORK}
 
 ## Api env
 API_DOCKER_IMAGE_TAG=main

diff --git a/docker-api-indexer.yaml b/docker-api-indexer.yaml
@@ -27,8 +27,8 @@ services:
       DEVKIT_URL: ${DEVKIT_URL}
       DEVKIT_PORT: ${DEVKIT_PORT}
     volumes:
-      - ./${CARDANO_CONFIG}:/config
-      - ./${CARDANO_NODE_SOCKET_PATH}:${CARDANO_NODE_SOCKET_PATH}
+      - ${CARDANO_CONFIG}:/config
+      - ${CARDANO_NODE_SOCKET_PATH}:${CARDANO_NODE_SOCKET_PATH}
     healthcheck:
       test: [ "CMD-SHELL", "curl --fail http://localhost:${API_PORT}/network/options -H 'Content-Type: application/json' --data '{\"metadata\": {}}' -X POST" ]
       interval: 30s
@@ -63,7 +63,7 @@ services:
       GENESIS_CONWAY_PATH: ${GENESIS_CONWAY_PATH}
       INITIAL_BALANCE_CALCULATION_BLOCK: ${INITIAL_BALANCE_CALCULATION_BLOCK}
     volumes:
-      - ./${CARDANO_CONFIG}:/config
+      - ${CARDANO_CONFIG}:/config
     restart: always
     depends_on:
       db:
@@ -81,7 +81,7 @@ services:
       POSTGRES_DB: ${DB_NAME}
     restart: on-failure
     volumes:
-      - ./${DB_PATH}:/var/lib/postgresql/data
+      - ${DB_PATH}:/var/lib/postgresql/data
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME} -p ${DB_PORT} -h localhost"]
       interval: 10s

diff --git a/docker-node.yaml b/docker-node.yaml
@@ -5,9 +5,9 @@ services:
     environment:
       - NETWORK=${NETWORK}
     volumes:
-      - ./${CARDANO_NODE_SOCKET_PATH}:${CARDANO_NODE_SOCKET_PATH}
-      - ./${CARDANO_NODE_DB}:/data/db
-      - ./${CARDANO_CONFIG}:/config
+      - ${CARDANO_NODE_SOCKET_PATH}:${CARDANO_NODE_SOCKET_PATH}
+      - ${CARDANO_NODE_DB}:/data/db
+      - ${CARDANO_CONFIG}:/config
     ports:
       - ${CARDANO_NODE_PORT}:${CARDANO_NODE_PORT}
     entrypoint: cardano-node run --database-path /data/db --port ${CARDANO_NODE_PORT} --socket-path ${CARDANO_NODE_SOCKET} --topology /config/topology.json --config /config/config.json
@@ -19,7 +19,7 @@ services:
     depends_on:
       - cardano-node
     volumes:
-      - ./${CARDANO_NODE_SOCKET_PATH}:/node-ipc
+      - ${CARDANO_NODE_SOCKET_PATH}:/node-ipc
     ports:
       - ${NODE_SUBMIT_API_PORT}:8090
     restart: on-failure