move datalake storage config to overrides

Signed-off-by: Alexander Onnikov <[email protected]>

Author: aonnikov

tests/.env

@@ -1,4 +1,5 @@
-STORAGE_CONFIG="datalake|http://datalake:4031"
+STORAGE_CONFIG="minio|minio?accessKey=minioadmin&secretKey=minioadmin"
+DATALAKE_STORAGE_CONFIG="datalake|http://datalake:4031"
 BACKUP_STORAGE_CONFIG="minio|minio?accessKey=minioadmin&secretKey=minioadmin"
 BACKUP_BUCKET_NAME=dev-backups
 

tests/docker-compose.override.yaml

@@ -2,12 +2,47 @@ services:
   account:
     environment:
       - DB_URL=${DB_PG_URL}
+      - STORAGE_CONFIG=${DATALAKE_STORAGE_CONFIG}
   transactor:
     environment:
       - DB_URL=${DB_PG_URL}
+      - STORAGE_CONFIG=${DATALAKE_STORAGE_CONFIG}
   workspace:
     environment:
       - DB_URL=${DB_PG_URL}
+      - STORAGE_CONFIG=${DATALAKE_STORAGE_CONFIG}
   fulltext:
     environment:
       - DB_URL=${DB_PG_URL}
+      - STORAGE_CONFIG=${DATALAKE_STORAGE_CONFIG}
+  front:
+    environment:
+      - STORAGE_CONFIG=${DATALAKE_STORAGE_CONFIG}
+      - FILES_URL=http://localhost:4031/blob/:workspace/:blobId/:filename
+      - UPLOAD_URL=http://localhost:4031/upload/form-data/:workspace
+      - PREVIEW_CONFIG=http://localhost:4031/image/fit=cover,width=:width,height=:height,dpr=:dpr/:workspace/:blobId
+  collaborator:
+    environment:
+      - STORAGE_CONFIG=${DATALAKE_STORAGE_CONFIG}
+  datalake:
+    image: hardcoreeng/datalake
+    depends_on:
+      minio:
+        condition: service_healthy
+      cockroach:
+        condition: service_started
+      stats:
+        condition: service_started
+      account:
+        condition: service_started
+    ports:
+      - 4031:4031
+    environment:
+      - PORT=4031
+      - SECRET=secret
+      - ACCOUNTS_URL=http://account:3003
+      - STATS_URL=http://stats:4901
+      - STREAM_URL=http://localhost:1081/recording
+      - DB_URL=${DB_PG_URL}
+      - BUCKETS=blobs,eu|http://minio:9000?accessKey=minioadmin&secretKey=minioadmin
+    restart: unless-stopped

tests/docker-compose.yaml

@@ -173,9 +173,7 @@ services:
       - SERVER_SECRET=secret
       - ACCOUNTS_URL_INTERNAL=http://account:3003
       - ACCOUNTS_URL=http://localhost:3003
-      - FILES_URL=http://localhost:4031/blob/:workspace/:blobId/:filename
-      - UPLOAD_URL=http://localhost:4031/upload/form-data/:workspace
-      - PREVIEW_CONFIG=http://localhost:4031/image/fit=cover,width=:width,height=:height,dpr=:dpr/:workspace/:blobId
+      - UPLOAD_URL=/files
       - ELASTIC_URL=http://elastic:9200
       - GMAIL_URL=http://localhost:8088
       - CALENDAR_URL=http://localhost:8095
@@ -275,28 +273,6 @@ services:
       - REKONI_URL=http://rekoni:4007
       - ACCOUNTS_URL=http://account:3003
       - STATS_URL=http://stats:4901
-  datalake:
-    image: hardcoreeng/datalake
-    depends_on:
-      minio:
-        condition: service_healthy
-      cockroach:
-        condition: service_started
-      stats:
-        condition: service_started
-      account:
-        condition: service_started
-    ports:
-      - 4031:4031
-    environment:
-      - PORT=4031
-      - SECRET=secret
-      - ACCOUNTS_URL=http://account:3003
-      - STATS_URL=http://stats:4901
-      - STREAM_URL=http://localhost:1081/recording
-      - DB_URL=${DB_PG_URL}
-      - BUCKETS=blobs,eu|http://minio:9000?accessKey=minioadmin&secretKey=minioadmin
-    restart: unless-stopped
   stats:
     image: hardcoreeng/stats
     ports:

tests/tool.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export MODEL_VERSION=$(node ../common/scripts/show_version.js)
-export STORAGE_CONFIG="datalake|http://localhost:4031"
+export STORAGE_CONFIG="minio|minio?accessKey=minioadmin&secretKey=minioadmin"
 export ACCOUNTS_URL=http://localhost:3003
 export TRANSACTOR_URL=ws://localhost:3334
 export ACCOUNT_DB_URL=mongodb://localhost:27018