Update docker-compose.yml

.env

@@ -1,21 +1,18 @@
-SECRET_KEY_BASE=euciey3AitaevohReel3yee3AihoeSagroongaiAhaighoh2vahdee3ahsah6fu8baes4kee6zieTae6oz
-
-TZ=Europe/Moscow
-
 #homs
+HOMS_SECRET_KEY_BASE=secret
 HOMS_URL=http://homs:3000/api
 HOMS_PORT=3000
 HOMS_LOG_LEVEL=debug
 [email protected]
 HOMS_PASSWORD=changeme
-HOMS_TOKEN=ycgx-Zi2ahrohiegae5ne4hb
+HOMS_TOKEN=secret
 HOMS_SSL=false
 HOMS_TIMEOUT=30000
 HOMS_DB_HOST=postgres-homs
 HOMS_DB_PORT=5432
 HOMS_DB_NAME=homs
 HOMS_DB_USER=homs
-HOMS_DB_PASSWORD=aen4EepheemeiChohquoomie
+HOMS_DB_PASSWORD=homs
 HOMS_DB_SEED=true
 
 #camunda
@@ -29,11 +26,11 @@ BPM_DB_HOST=postgres-camunda
 BPM_DB_PORT=5432
 BPM_DB_NAME=camunda
 BPM_DB_USER=camunda
-BPM_DB_PASSWORD=Beevo1UK1athev3p
+BPM_DB_PASSWORD=camunda
 BPM_DB_DRIVER=org.postgresql.Driver
 BPM_DB_SEED=true
 BPM_HISTORY_LEVEL=full
-BPM_LOG_LEVEL=debug
+BPM_LOG_LEVEL=info
 HTTP_CONNECT_TIMEOUT_SEC=2400
 HTTP_READ_TIMEOUT_SEC=2400
 HTTP_WRITE_TIMEOUT_SEC=2400
@@ -42,6 +39,6 @@ HTTP_WRITE_TIMEOUT_SEC=2400
 MINIO_HOST=http://minio
 MINIO_PORT=10000
 MINIO_BUCKET_NAME=homs
-MINIO_ACCESS_KEY=ees5vu5Ohk3eed2aizoo4Iqu7Ai8poo9
-MINIO_SECRET_KEY=aezeib3Eik2xageep8biequah3lahhahMee5ahgai3zeeZohr3ea0boocheiW8ae
+MINIO_ACCESS_KEY=minioadmin
+MINIO_SECRET_KEY=minioadmin
 MINIO_SSL=false

docker-compose.yml

@@ -1,119 +1,89 @@
-version: '2'
+version: '3.6'
 services:
-  db_camunda:
+  postgres_camunda:
     image: postgres:12-alpine
     container_name: postgres-camunda
-    restart: always
-    env_file: ".env"
+    restart: unless-stopped
+    env_file: .env
     environment:
       POSTGRES_DB: $BPM_DB_NAME
       POSTGRES_USER: $BPM_DB_USER
       POSTGRES_PASSWORD: $BPM_DB_PASSWORD
     volumes:
       - ./data/camunda/postgresql:/var/lib/postgresql/data
     networks:
-      - postgres-camunda
-  db_homs:
+      - hydra
+  postgres_homs:
     image: postgres:12-alpine
     container_name: postgres-homs
-    restart: always
-    env_file: ".env"
+    restart: unless-stopped
+    env_file: .env
     environment:
       POSTGRES_DB: $HOMS_DB_NAME
       POSTGRES_USER: $HOMS_DB_USER
       POSTGRES_PASSWORD: $HOMS_DB_PASSWORD
     volumes:
       - ./data/homs/postgresql:/var/lib/postgresql/data
     networks:
-      - postgres-homs
+      - hydra
   minio:
-    image: minio/minio
+    image: minio/minio:RELEASE.2021-06-17T00-10-46Z
     container_name: minio
-    restart: always
-    command: server /opt/minio --console-address "0.0.0.0:9001"
-    env_file: ".env"
-    environment:
-      - TZ=${TZ}
+    restart: unless-stopped
+    command: server /opt/minio --address "0.0.0.0:9001"
+    env_file: .env
     volumes:
-      - ./data/minio:/var/minio
+      - ./data/minio:/opt/minio
     ports:
       - $MINIO_PORT:9001
     networks:
-      - default
-      - minio
+      - hydra
   homs:
-    image: latera/homs:2.7.0
+    image: hydrabilling/homs
     container_name: homs
-    restart: always
-    env_file: ".env"
+    restart: unless-stopped
+    env_file: .env
     environment:
-      - TZ=${TZ}
-      - RAILS_ENV=production
-      - SEED_DB=${HOMS_DB_SEED}
-      - LOG_LEVEL=${HOMS_LOG_LEVEL}
-      - ADMIN_EMAIL=${HOMS_USER}
-      - ADMIN_PASSWORD=${HOMS_PASSWORD}
-      - ADMIN_API_TOKEN=${HOMS_TOKEN}
+      - SECRET_KEY_BASE=$HOMS_SECRET_KEY_BASE
+      - SEED_DB=$HOMS_DB_SEED
+      - LOG_LEVEL=$HOMS_LOG_LEVEL
+      - ADMIN_EMAIL=$HOMS_USER
+      - ADMIN_PASSWORD=$HOMS_PASSWORD
+      - ADMIN_API_TOKEN=$HOMS_TOKEN
       - REDIS_URL=redis://redis
     depends_on:
-      - db_homs
+      - postgres_homs
     volumes:
       - ./seeds.rb:/opt/homs/db/seeds.rb
       - ./hbw.yml:/opt/homs/config/hbw.yml
       - ./demo_processes/locales:/opt/homs/config/locales/bp:ro
     ports:
       - $HOMS_PORT:3000
     networks:
-      - default
-      - postgres-homs
-      - camunda
-      - homs
-      - redis
-      - minio
+      - hydra
   camunda:
-    image: latera/camunda-ext-2-lite:6.0
+    image: hydrabilling/camunda-ext-2-lite
     container_name: camunda
-    restart: always
-    env_file: ".env"
+    restart: unless-stopped
+    env_file: .env
     environment:
-      DB_USERNAME: $BPM_DB_USER
-      DB_PASSWORD: $BPM_DB_PASSWORD
-      LOG_LVL: "info"
-      WAIT_FOR: "${BPM_DB_HOST}:${BPM_DB_PORT}"
-      WAIT_FOR_TIMEOUT: 120
+      - DB_USERNAME=$BPM_DB_USER
+      - DB_PASSWORD=$BPM_DB_PASSWORD
+      - LOG_LVL=$BPM_LOG_LEVEL
+      - WAIT_FOR=$BPM_DB_HOST:$BPM_DB_PORT
+      - WAIT_FOR_TIMEOUT=120
     ports:
       - $BPM_PORT:8080
     depends_on:
-      - db_camunda
+      - postgres_camunda
     networks:
-      - default
-      - postgres-camunda
-      - homs
-      - minio
+      - hydra
   redis:
     image: healthcheck/redis
     container_name: redis
-    restart: always
-    environment:
-      - TZ=${TZ}
+    restart: unless-stopped
     networks:
-      - redis
+      - hydra
 networks:
-  postgres-camunda:
-    internal: true
-    name: postgres-camunda
-  postgres-homs:
-    internal: true
-    name: postgres-homs
-  camunda:
-    internal: true
-    name: camunda
-  homs:
-    internal: true
-    name: homs
-  minio:
-    internal: true
-    name: minio
-  redis:
-    internal: true
-    name: redis
+  hydra:
+    name: hydra