Merge branch 'master' into 'development'

Backport Master Changes to Development

See merge request sharing/codeability-sharing-platform!178

manual_deploy.sh

@@ -2,7 +2,7 @@
 source src/main/docker/.env
 echo "Deploying Gitsearch"
 
-#export GITBRANCH=test
+export GITBRANCH=master
 #export SPRING_PROFILES_ACTIVE=staging,swagger
 export COMMIT_ID="$(git rev-parse HEAD)"
 export MAVEN_USER_HOME=`pwd`/.maven && ./mvnw package -DskipTests -Pprod jib:build -Djib.to.image=sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform/gitsearch/$GITBRANCH -Djib.to.auth.username=gitlab-ci-token  -Djib.to.auth.password=$CI_BUILD_TOKEN -Dmaven.repo.local=$MAVEN_USER_HOME

src/main/docker/gitsearch.yml

@@ -13,7 +13,7 @@ services:
       - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE}
       - MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED=true
       - SPRING_DATASOURCE_URL=jdbc:mysql://sharing_mysql:3306/gitsearch?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
-      - JHIPSTER_SLEEP=15 # gives a small time for other services to boot before the application
+      - JHIPSTER_SLEEP=60 # gives a small time for other services to boot before the application
       - SPRING_DATA_JEST_URI=http://sharing_elasticsearch:9200
       - SPRING_ELASTICSEARCH_REST_URIS=http://sharing_elasticsearch:9200
       # see https://stackoverflow.com/questions/62676762/how-can-a-variable-set-in-the-docker-env-file-be-used-in-application-yml
@@ -60,11 +60,12 @@ services:
   postgres:
     image: postgres
     volumes:
-      - postgres_data:/var/lib/postgresql/data1
+      - postgres_data:/var/lib/postgresql/data
     environment:
       - POSTGRES_DB=keycloak
       - POSTGRES_USER=${POSTGRES_USER_KEYCLOAK}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - PGDATA=/var/lib/postgresql/data/pgdata
     restart: always
     networks:
       - backend