Hawk docker updates (#1055)

1. Minor updates with respect of hawk docker setup.

Author: siajasl

Dockerfile.dev.hawk

@@ -16,9 +16,9 @@ RUN apt-get update && apt-get install -y \
     wget
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
-ENV PATH "/root/.cargo/bin:${PATH}"
-ENV RUSTUP_HOME "/root/.rustup"
-ENV CARGO_HOME "/root/.cargo"
+ENV PATH="/root/.cargo/bin:${PATH}"
+ENV RUSTUP_HOME="/root/.rustup"
+ENV CARGO_HOME="/root/.cargo"
 RUN rustup toolchain install nightly-2024-07-10
 RUN rustup default nightly-2024-07-10
 RUN rustup component add cargo

Dockerfile.hawk

@@ -16,9 +16,9 @@ RUN apt-get update && apt-get install -y \
     wget
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
-ENV PATH "/root/.cargo/bin:${PATH}"
-ENV RUSTUP_HOME "/root/.rustup"
-ENV CARGO_HOME "/root/.cargo"
+ENV PATH="/root/.cargo/bin:${PATH}"
+ENV RUSTUP_HOME="/root/.rustup"
+ENV CARGO_HOME="/root/.cargo"
 RUN rustup toolchain install nightly-2024-07-10
 RUN rustup default nightly-2024-07-10
 RUN rustup component add cargo

docker-compose.dev.yaml

@@ -3,11 +3,12 @@ services:
     image: postgres
     ports:
       - "5432:5432"
+    user: "postgres"
     environment:
       POSTGRES_USER: "postgres"
       POSTGRES_PASSWORD: "postgres"
     volumes:
-      - ./scripts/init-db.sh:/docker-entrypoint-initdb.d/init-db.sh
+      - ./scripts/init-db-pgres.sql:/docker-entrypoint-initdb.d/init-db-pgres.sql
     healthcheck:
       test: ["CMD-SHELL", "pg_isready", "-d", "db_prod"]
       interval: 10s
@@ -17,6 +18,9 @@ services:
 
   localstack:
     image: localstack/localstack
+    depends_on:
+      dev_db:
+        condition: service_healthy
     ports:
       - "127.0.0.1:4566:4566"
       - "127.0.0.1:4571:4571"
@@ -28,12 +32,12 @@ services:
     healthcheck:
       test: >-
         sleep 10 &&
-        awslocal sqs list-queues && 
-        awslocal s3 ls && 
+        awslocal sqs list-queues &&
+        awslocal s3 ls &&
         awslocal kms list-keys
       interval: 5s
       timeout: 25s
       retries: 10
 
     volumes:
-      - ./scripts/init-localstack.sh:/etc/localstack/init/ready.d/init-localstack.sh
+      - ./scripts/init-localstack.sh:/etc/localstack/init/ready.d/init-localstack.sh

scripts/init-db-pgres.sql

@@ -0,0 +1,5 @@
+CREATE DATABASE "SMPC_dev_0";
+
+CREATE DATABASE "SMPC_dev_1";
+
+CREATE DATABASE "SMPC_dev_2";