Merge pull request #6 from iron-fish/rahul/docker-qol-improvements

small quality of life improvements to the docker experience

Author: patnir

.env.local

@@ -0,0 +1,16 @@
+# Copy this file to .env
+# Database Configuration
+DB_USER=postgres
+DB_PASSWORD=postgres
+DB_PORT=5444
+
+# Node Configuration
+NODE_HOST=host.docker.internal
+NODE_PORT=9092
+
+# Server Configuration
+SERVER_PORT=8080
+
+# Security Keys
+SECRET_KEY=a0882c5ac5e2fa771dde52b2d5639734a4411df14f4748c6f991a96e5dd9f997
+PUBLIC_KEY=03221b2a0ebd9d6798aadee2861a5307ced1a33d143f34c571a98ab4fa534b7d3e

README.md

@@ -48,3 +48,17 @@ PUBLIC_KEY=03221b2a0ebd9d6798aadee2861a5307ced1a33d143f34c571a98ab4fa534b7d3e \
 SERVER_PORT=8080 \
 docker-compose up
 ```
+
+Or you can use up with local .env file by copying .env.local to .env:
+
+```bash
+cp .env.local .env
+docker compose up --build
+```
+
+Tips
+
+This came in handy for me because I had a different version of postgres running. To remove all previous data: 
+```bash
+docker compose down -v
+```

docker-compose.yml

@@ -1,6 +1,7 @@
 version: '2.4'
 services:
   dbconfig:
+    env_file: .env
     image: alpine:latest
     volumes:
       - conf:/app/conf  # Mount the config directory on the host to the container
@@ -14,7 +15,8 @@ services:
       protocol: \"postgres\"' > /app/conf/dbconfig"
 
   postgres:
-    image: postgres:latest
+    env_file: .env
+    image: postgres:16
     environment:
       POSTGRES_USER: ${DB_USER}
       POSTGRES_PASSWORD: ${DB_PASSWORD}
@@ -27,11 +29,13 @@ services:
       - oreowallet_network
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${DB_USER}"]
-      interval: 10s
+      interval: 5s
       timeout: 5s
       retries: 5
+      start_period: 10s
 
   migration:
+    env_file: .env
     build: .
     image: "oreowallet"
     command: /bin/sh -c "./sqlx database create && ./sqlx migrate run"
@@ -40,23 +44,27 @@ services:
     networks:
       - oreowallet_network
     depends_on:
-      - postgres
-      - dbconfig
+      postgres:
+        condition: service_healthy
+      dbconfig:
+        condition: service_completed_successfully
     logging:
         driver: "json-file"
         options:
             max-file: "4"
             max-size: "25m"
 
   chainloader:
+    env_file: .env
     build: .
     restart: always
     image: "oreowallet"
     command: ./chain_loader --dbconfig /app/conf/dbconfig --node ${NODE_HOST}:${NODE_PORT} --verbosity ${VERBOSITY:-0}
     volumes:
        - conf:/app/conf
     depends_on:
-      - migration
+      migration:
+        condition: service_completed_successfully
     networks:
       - oreowallet_network
     ulimits:
@@ -70,15 +78,18 @@ services:
             max-size: "25m"
 
   prover:
+    env_file: .env
     build: .
     restart: always
     image: "oreowallet"
     command: ./prover --verbosity ${VERBOSITY:-0}
     ports:
       - "10002:10002"
     depends_on:
-      - migration
-      - chainloader
+      migration:
+        condition: service_completed_successfully
+      chainloader:
+        condition: service_completed_successfully
     networks:
       - oreowallet_network
     ulimits:
@@ -92,6 +103,7 @@ services:
             max-size: "25m"
 
   server:
+    env_file: .env
     build: .
     restart: always
     image: "oreowallet"
@@ -121,6 +133,7 @@ services:
             max-size: "25m"
 
   dservice:
+    env_file: .env
     build: .
     restart: always
     image: "oreowallet"
@@ -134,8 +147,10 @@ services:
     volumes:
       - conf:/app/conf
     depends_on:
-      - migration
-      - chainloader
+      migration:
+        condition: service_completed_successfully
+      chainloader:
+        condition: service_completed_successfully
     networks:
       oreowallet_network:
         ipv4_address: 172.19.0.10
@@ -150,14 +165,18 @@ services:
             max-size: "25m"
 
   dworker:
+    env_file: .env
     build: .
     restart: always
     image: "oreowallet"
     command: ./dworker --address 172.19.0.10:10001 --verbosity ${VERBOSITY:-0}
     depends_on:
-      - migration
-      - chainloader
-      - dservice
+      migration:
+        condition: service_completed_successfully
+      chainloader:
+        condition: service_completed_successfully
+      dservice:
+        condition: service_completed_successfully
     networks:
       - oreowallet_network
     ulimits: