merge development into master

src/main/docker/gitsearch.yml

@@ -45,7 +45,7 @@ services:
       options:
         max-size: 50m
     depends_on:
-      - keycloak
+      #      - keycloak
       - sharing_mysql
       # - sharing_elasticsearch
     networks:
@@ -68,54 +68,54 @@ services:
     restart: always
     networks:
       - backend
-  postgres:
-    image: postgres
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
-    logging:
-      options:
-        max-size: 50m
-    environment:
-      - POSTGRES_DB=keycloak
-      - POSTGRES_USER=${POSTGRES_USER_KEYCLOAK}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - PGDATA=/var/lib/postgresql/data/pgdata
-    restart: always
-    networks:
-      - backend
-      - frontend
-    depends_on:
-      - sharing_mysql
-  keycloak:
-    image: quay.io/keycloak/keycloak:18.0.2-legacy
-    environment:
-      - DB_VENDOR=POSTGRES
-      - DB_ADDR=postgres
-      - DB_DATABASE=keycloak
-      - DB_USER=${POSTGRES_USER_KEYCLOAK}
-      - DB_SCHEMA=public
-      - DB_PASSWORD=${POSTGRES_PASSWORD}
-      - KEYCLOAK_USER=${KEYCLOAK_USER}
-      - KEYCLOAK_PASSWORD=${KEYCLOAK_PASSWORD}
-      - PROXY_ADDRESS_FORWARDING=true
-      - GITSEARCH_PATH=$GITSEARCH_PATH
-      # Uncomment the line below if you want to specify JDBC parameters. The parameter below is just an example, and it shouldn't be used in production without knowledge. It is highly recommended that you read the PostgreSQL JDBC driver documentation in order to use it.
-      #JDBC_PARAMS: "ssl=true"
-    ports:
-      - 8082:8080
-    logging:
-      options:
-        max-size: 50m
-    restart: always
-    volumes:
-      - $GITSEARCH_PATH/src/main/resources/keycloak-theme/themes/gitsearch:/opt/jboss/keycloak/themes/gitsearch
-      #- /home/contDeploy/gitsearch2/gitsearch/src/main/resources/keycloak-theme/themes/gitsearch:/opt/jboss/keycloak/themes/gitsearch
-      # - ../resources/keycloak-theme/configuration:/opt/jboss/keycloak/standalone/configuration
-    depends_on:
-      - postgres
-    networks:
-      - backend
-      - frontend
+  #  postgres:
+  #    image: postgres
+  #    volumes:
+  #      - postgres_data:/var/lib/postgresql/data
+  #    logging:
+  #      options:
+  #        max-size: 50m
+  #    environment:
+  #      - POSTGRES_DB=keycloak
+  #      - POSTGRES_USER=${POSTGRES_USER_KEYCLOAK}
+  #      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+  #      - PGDATA=/var/lib/postgresql/data/pgdata
+  #    restart: always
+  #    networks:
+  #      - backend
+  #      - frontend
+  #    depends_on:
+  #      - sharing_mysql
+  #  keycloak:
+  #    image: quay.io/keycloak/keycloak:18.0.2-legacy
+  #    environment:
+  #      - DB_VENDOR=POSTGRES
+  #      - DB_ADDR=postgres
+  #      - DB_DATABASE=keycloak
+  #      - DB_USER=${POSTGRES_USER_KEYCLOAK}
+  #      - DB_SCHEMA=public
+  #      - DB_PASSWORD=${POSTGRES_PASSWORD}
+  #      - KEYCLOAK_USER=${KEYCLOAK_USER}
+  #      - KEYCLOAK_PASSWORD=${KEYCLOAK_PASSWORD}
+  #      - PROXY_ADDRESS_FORWARDING=true
+  #      - GITSEARCH_PATH=$GITSEARCH_PATH
+  #      # Uncomment the line below if you want to specify JDBC parameters. The parameter below is just an example, and it shouldn't be used in production without knowledge. It is highly recommended that you read the PostgreSQL JDBC driver documentation in order to use it.
+  #      #JDBC_PARAMS: "ssl=true"
+  #    ports:
+  #      - 8082:8080
+  #    logging:
+  #      options:
+  #        max-size: 50m
+  #    restart: always
+  #    volumes:
+  #      - $GITSEARCH_PATH/src/main/resources/keycloak-theme/themes/gitsearch:/opt/jboss/keycloak/themes/gitsearch
+  #      #- /home/contDeploy/gitsearch2/gitsearch/src/main/resources/keycloak-theme/themes/gitsearch:/opt/jboss/keycloak/themes/gitsearch
+  #      # - ../resources/keycloak-theme/configuration:/opt/jboss/keycloak/standalone/configuration
+  #    depends_on:
+  #      - postgres
+  #    networks:
+  #      - backend
+  #      - frontend
   docker-hoster:
     image: dvdarias/docker-hoster
     volumes: