Change compose file to fit Qiita deployment, keep compose file from keycloak branch as keycloak_compose.yaml

Author: Anna-Rehm

compose.yaml

@@ -1,52 +1,41 @@
-version: '3'
-
 services:
-  keycloak-db:
+  qiita-db:
     image: postgres:15
-    container_name: keycloak-db
-    hostname: keycloak-db
-    restart: unless-stopped
+    container_name: qiita-db
+    hostname: qiita-db
+    network_mode: host
+    restart: no
     env_file:
-      - ./environments/db.env
+      - ./environments/qiita_db.env
     environment:
       - POSTGRES_DB=postgres
       - POSTGRES_USER=postgres
-      - KEYCLOAK_DB_NAME=keycloak
-      - KEYCLOAK_DB_USER=keycloak
+      - POSTGRES_DB_NAME=postgres
+      - POSTGRES_DB_USER=postgres
     volumes:
-      - './environments/db-init.sh:/docker-entrypoint-initdb.d/db-init.sh'
+      - './environments/qiita-db-init.sh:/docker-entrypoint-initdb.d/qiita-db-init.sh'
       - 'postgres-data:/var/lib/postgresql/data'
+    ports:
+      - "6543:5432"
 
-  keycloak:
-      image: quay.io/keycloak/keycloak:24.0.2
-      command: ['start']
+  qiita:
+      image: qiita:latest 
+      command: ['./start_qiita.sh'] #executes bash script inside the container
+      stdin_open: true
+      tty: true
+      network_mode: host
       ports:
-        - "8282:8282"  # as the HAproxy of BCF if configured to forward requests here
-      restart: unless-stopped
+        - "21174:21174"  #wihtout nginx
+      restart: no
       depends_on:
-        - keycloak-db
+        - qiita-db
       env_file:
-        - './environments/keycloak.env'
+        - './environments/qiita.env'
       environment:
-        - KEYCLOAK_ADMIN=admin
-        - KC_DB=postgres
-        - KC_DB_URL_HOST=keycloak-db
-        - KC_DB_URL_PORT=5432
-        - KC_DB_URL_DATABASE=keycloak
-        - KC_DB_USERNAME=keycloak
-        - KC_DB_SCHEMA=public
-        - KC_HTTP_HOST=0.0.0.0
-        - KC_HTTP_ENABLED=false
-        - KC_HTTP_PORT=8282
-        - KC_PROXY=edge
-        - KC_PROXY_HEADERS=forwarded
-        - KC_PROXY_ADDRESS_FORWARDING=true
-        - KC_HOSTNAME_URL=https://keycloak.jlab.bio
-        - KC_HOSTNAME_ADMIN_URL=https://keycloak.jlab.bio
-        - KC_LOG_LEVEL=WARN
-        #- KC_HOSTNAME_DEBUG=true
-        #- JAVA_OPTS_APPEND="-Djava.net.preferIPv4Stack=true"
+        - QIITA_ROOTCA_CERT=/qiita/qiita_core/support_files/ci_rootca.crt
+        - QIITA_CONFIG_FP=/qiita/qiita_core/support_files/config_test.cfg
+
 
 volumes:
   postgres-data:
-    name: keycloak-postgres-data
+    name: qiita-postgres-data

keycloak_compose.yaml

@@ -0,0 +1,52 @@
+version: '3'
+
+services:
+  keycloak-db:
+    image: postgres:15
+    container_name: keycloak-db
+    hostname: keycloak-db
+    restart: unless-stopped
+    env_file:
+      - ./environments/db.env
+    environment:
+      - POSTGRES_DB=postgres
+      - POSTGRES_USER=postgres
+      - KEYCLOAK_DB_NAME=keycloak
+      - KEYCLOAK_DB_USER=keycloak
+    volumes:
+      - './environments/db-init.sh:/docker-entrypoint-initdb.d/db-init.sh'
+      - 'postgres-data:/var/lib/postgresql/data'
+
+  keycloak:
+      image: quay.io/keycloak/keycloak:24.0.2
+      command: ['start']
+      ports:
+        - "8282:8282"  # as the HAproxy of BCF if configured to forward requests here
+      restart: unless-stopped
+      depends_on:
+        - keycloak-db
+      env_file:
+        - './environments/keycloak.env'
+      environment:
+        - KEYCLOAK_ADMIN=admin
+        - KC_DB=postgres
+        - KC_DB_URL_HOST=keycloak-db
+        - KC_DB_URL_PORT=5432
+        - KC_DB_URL_DATABASE=keycloak
+        - KC_DB_USERNAME=keycloak
+        - KC_DB_SCHEMA=public
+        - KC_HTTP_HOST=0.0.0.0
+        - KC_HTTP_ENABLED=false
+        - KC_HTTP_PORT=8282
+        - KC_PROXY=edge
+        - KC_PROXY_HEADERS=forwarded
+        - KC_PROXY_ADDRESS_FORWARDING=true
+        - KC_HOSTNAME_URL=https://keycloak.jlab.bio
+        - KC_HOSTNAME_ADMIN_URL=https://keycloak.jlab.bio
+        - KC_LOG_LEVEL=WARN
+        #- KC_HOSTNAME_DEBUG=true
+        #- JAVA_OPTS_APPEND="-Djava.net.preferIPv4Stack=true"
+
+volumes:
+  postgres-data:
+    name: keycloak-postgres-data