Removed the deployment scripts, removed the git hash

dbrepo-ui/.env.example

@@ -12,4 +12,3 @@ SEARCH="http://localhost:3001/retrieve"
 SHARED_FILESYSTEM="/tmp"
 TITLE="Database Repository"
 VERSION="latest"
-GIT_HASH="deadbeef"

dbrepo-ui/Dockerfile

@@ -4,7 +4,8 @@ MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
 RUN apk --no-cache add curl
 RUN cd /tmp && curl -LO https://github.com/prometheus/node_exporter/releases/download/v0.18.1/node_exporter-0.18.1.linux-amd64.tar.gz && tar -xvf node_exporter-0.18.1.linux-amd64.tar.gz && mv node_exporter-0.18.1.linux-amd64/node_exporter /usr/local/bin/
 
-ARG TAG=1.2
+ARG TAG=latest
+ARG GIT_HASH_SHORT=git_hash
 
 ENV NODE_ENV=production
 ENV HOST=0.0.0.0
@@ -51,12 +52,12 @@ ENV SHARED_FILESYSTEM="/tmp"
 ENV LOGO="/logo.png"
 ENV ELASTIC_USERNAME="elastic"
 ENV ELASTIC_PASSWORD="elastic"
-ENV VERSION="${TAG:-latest}"
+ENV VERSION="${TAG}"
 ENV TITLE="Database Repository"
 ENV ICON="/favicon.ico"
 ENV DBREPO_CLIENT_ID="dbrepo-client"
 ENV DBREPO_CLIENT_SECRET="MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG"
-ENV GIT_HASH="deadbeef"
+ENV GIT_HASH="${GIT_HASH_SHORT}"
 
 WORKDIR /app
 

dbrepo-ui/config.js

@@ -17,6 +17,5 @@ config.clientId = process.env.DBREPO_CLIENT_ID || 'dbrepo-client'
 config.clientSecret = process.env.DBREPO_CLIENT_SECRET || 'MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG'
 config.defaultPublisher = process.env.DEFAULT_PID_PUBLISHER || 'Example University'
 config.doiUrl = process.env.DOI_URL || 'https://doi.org'
-config.gitHash = process.env.GIT_HASH || 'deadbeef'
 
 module.exports = config

dbrepo-ui/layouts/default.vue

@@ -10,7 +10,7 @@
       <v-list-item class="mt-2">
         <v-list-item-content>
           <v-list-item-subtitle>
-            {{ version }} ({{ gitHash }})
+            {{ version }}
           </v-list-item-subtitle>
           <v-list-item-title class="text-h6">
             Database Repository
@@ -183,9 +183,6 @@ export default {
     version () {
       return this.$config.version
     },
-    gitHash () {
-      return this.$config.gitHash
-    },
     canListOntologies () {
       if (!this.roles) {
         return false

dbrepo-ui/nuxt.config.js

 import path from 'path'
 import colors from 'vuetify/es5/util/colors'
-import { api, icon, search, clientSecret, title, logo, version, defaultPublisher, doiUrl, baseUrl, gitHash, clientId } from './config'
+import { api, icon, search, clientSecret, title, logo, version, defaultPublisher, doiUrl, baseUrl, clientId } from './config'
 
 const proxy = {}
 
@@ -94,8 +94,7 @@ export default {
     clientSecret,
     defaultPublisher,
     doiUrl,
-    baseUrl,
-    gitHash
+    baseUrl
   },
 
   serverMiddleware: [

docker-compose.dbrepo1.yml

-# INFO: This compose file deploys the official Docker images from a stable, tested master branch
-# MODIFIED: 2023-06-01
-# MAINTAINER: Martin Weise <martin.weise@tuwien.ac.at>
-
-version: "3.6"
-
-volumes:
-  metadata-db-data:
-  search-db-data:
-  broker-service-data:
-
-networks:
-  public:
-    name: public
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.29.0.0/16
-  userdb:
-    name: userdb
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.28.0.0/16
-  core:
-    name: core
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.27.0.0/16
-
-services:
-
-  dbrepo-metadata-db:
-    restart: "no"
-    container_name: dbrepo-metadata-db
-    hostname: metadata-db
-    image: dbrepo/metadata-db:1.2
-    networks:
-      core:
-    volumes:
-      - metadata-db-data:/var/lib/mysql
-    ports:
-      - "3306:3306"
-      - "9100:9100"
-    env_file:
-      - .env
-    logging:
-      driver: json-file
-
-  dbrepo-database-service:
-    restart: "no"
-    container_name: dbrepo-database-service
-    hostname: database-service
-    image: dbrepo/database-service:1.2
-    networks:
-      userdb:
-      core:
-    env_file:
-      - .env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    depends_on:
-      dbrepo-container-service:
-        condition: service_healthy
-      dbrepo-broker-service:
-        condition: service_started
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-container-service:
-    restart: "no"
-    container_name: dbrepo-container-service
-    hostname: container-service
-    image: dbrepo/container-service:1.2
-    networks:
-      core:
-    env_file:
-      - .env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    depends_on:
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-authentication-service:
-    restart: "no"
-    container_name: dbrepo-authentication-service
-    hostname: authentication-service
-    image: dbrepo/authentication-service:1.2
-    networks:
-      core:
-    ports:
-      - "8443:8443"
-      - "8080:8080"
-    env_file:
-      - .env
-    volumes:
-      - authentication-service-data:/opt/keycloak/data/
-    depends_on:
-      dbrepo-metadata-db:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-query-service:
-    restart: "no"
-    container_name: dbrepo-query-service
-    hostname: query-service
-    image: dbrepo/query-service:1.2
-    networks:
-      core:
-      userdb:
-    env_file:
-      - .env
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-    depends_on:
-      dbrepo-broker-service:
-        condition: service_healthy
-      dbrepo-table-service:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-table-service:
-    restart: on-failure
-    container_name: dbrepo-table-service
-    hostname: table-service
-    image: dbrepo/table-service:1.2
-    networks:
-      core:
-      userdb:
-    env_file:
-      - .env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ${SHARED_FILESYSTEM}:/tmp
-    depends_on:
-      dbrepo-authentication-service:
-        condition: service_healthy
-      dbrepo-search-db:
-        condition: service_started
-      dbrepo-broker-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-identifier-service:
-    restart: "no"
-    container_name: dbrepo-identifier-service
-    hostname: identifier-service
-    image: dbrepo/identifier-service:1.2
-    networks:
-      core:
-    env_file:
-      - .env
-    environment:
-      - SPRING_PROFILES_ACTIVE=doi
-    depends_on:
-      dbrepo-query-service:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-    logging:
-      driver: json-file
-
-  dbrepo-metadata-service:
-    restart: "no"
-    container_name: dbrepo-metadata-service
-    hostname: metadata-service
-    image: dbrepo/metadata-service:1.2
-    networks:
-      core:
-    env_file:
-      - .env
-    depends_on:
-      dbrepo-authentication-service:
-        condition: service_healthy
-      dbrepo-metadata-db:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-analyse-service:
-    restart: "no"
-    container_name: dbrepo-analyse-service
-    hostname: analyse-service
-    image: dbrepo/analyse-service:1.2
-    networks:
-      core:
-      userdb:
-    env_file:
-      - .env
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-      - /var/run/docker.sock:/var/run/docker.sock
-    logging:
-      driver: json-file
-
-  dbrepo-user-service:
-    restart: "no"
-    container_name: dbrepo-user-service
-    hostname: user-service
-    image: dbrepo/user-service:latest
-    networks:
-      core:
-    ports:
-      - "9098:9098"
-    env_file:
-      - .env
-    depends_on:
-      dbrepo-metadata-db:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-semantics-service:
-    restart: "no"
-    container_name: dbrepo-semantics-service
-    hostname: semantics-service
-    image: dbrepo/semantics-service:1.2
-    networks:
-      core:
-    env_file:
-      - .env
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-      - /var/run/docker.sock:/var/run/docker.sock
-    depends_on:
-      dbrepo-metadata-db:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-broker-service:
-    restart: "no"
-    container_name: dbrepo-broker-service
-    hostname: broker-service
-    image: dbrepo/broker-service:1.2
-    networks:
-      core:
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-    env_file:
-      - .env
-    depends_on:
-      dbrepo-authentication-service:
-        condition: service_healthy
-    volumes:
-      - broker-service-data:/var/lib/rabbitmq/
-    logging:
-      driver: json-file
-
-  dbrepo-search-db:
-    restart: always
-    container_name: dbrepo-search-db
-    hostname: search-db
-    image: elasticsearch:8.7.1
-    networks:
-      core:
-    env_file:
-      - .env
-    environment:
-      discovery.type: "single-node"
-      ES_JAVA_OPTS: "-Xms2g -Xmx2g"
-      logger.level: "WARN"
-      bootstrap.memory_lock: "true"
-      xpack.security.enabled: "true"
-    volumes:
-      - search-db-data:/usr/share/elasticsearch/data
-    logging:
-      driver: json-file
-
-  dbrepo-ui:
-    restart: "no"
-    container_name: dbrepo-ui
-    hostname: ui
-    image: dbrepo/ui:1.2
-    networks:
-      core:
-      public:
-    env_file:
-      - .env
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-    depends_on:
-      dbrepo-identifier-service:
-        condition: service_healthy
-      dbrepo-database-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-gateway-service:
-    restart: "no"
-    container_name: dbrepo-gateway-service
-    hostname: gateway-service
-    image: nginx:1.25-alpine-slim
-    networks:
-      core:
-      public:
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - /root/geant/dbrepo1.ec.tuwien.ac.at.pem:/etc/nginx/fullchain.pem:ro
-      - /root/geant/dbrepo1.ec.tuwien.ac.at.key:/etc/nginx/privkey.pem:ro
-      - /home/demo/dbrepo-tuw/proxy/dbrepo.conf:/etc/nginx/conf.d/default.conf
-      - /root/geant/ssl_passwords.txt:/etc/nginx/ssl_passwords.txt
-    depends_on:
-      dbrepo-analyse-service:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-      dbrepo-broker-service:
-        condition: service_healthy
-      dbrepo-container-service:
-        condition: service_healthy
-      dbrepo-database-service:
-        condition: service_healthy
-      dbrepo-identifier-service:
-        condition: service_healthy
-      dbrepo-metadata-service:
-        condition: service_healthy
-      dbrepo-query-service:
-        condition: service_healthy
-      dbrepo-search-db:
-        condition: service_started
-      dbrepo-semantics-service:
-        condition: service_healthy
-      dbrepo-table-service:
-        condition: service_healthy
-      dbrepo-ui:
-        condition: service_started
-      dbrepo-user-service:
-        condition: service_healthy
-    logging:
-      driver: json-file

docker-compose.dbrepo2.yml

-# INFO: This compose file deploys the official Docker images from a staging, tested dev branch
-# MODIFIED: 2023-06-01
-# MAINTAINER: Martin Weise <martin.weise@tuwien.ac.at>
-
-version: "3.6"
-
-volumes:
-  metadata-db-data:
-  search-db-data:
-  broker-service-data:
-  authentication-service-data:
-
-networks:
-  public:
-    name: public
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.29.0.0/16
-  userdb:
-    name: userdb
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.28.0.0/16
-  core:
-    name: core
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.27.0.0/16
-
-services:
-
-  dbrepo-metadata-db:
-    restart: "no"
-    container_name: dbrepo-metadata-db
-    hostname: metadata-db
-    image: dbrepo/metadata-db:latest
-    networks:
-      core:
-    volumes:
-      - metadata-db-data:/var/lib/mysql
-    ports:
-      - "3306:3306"
-      - "9100:9100"
-    env_file:
-      - .env
-    logging:
-      driver: json-file
-
-  dbrepo-database-service:
-    restart: "no"
-    container_name: dbrepo-database-service
-    hostname: database-service
-    image: dbrepo/database-service:latest
-    networks:
-      userdb:
-      core:
-    env_file:
-      - .env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    depends_on:
-      dbrepo-container-service:
-        condition: service_healthy
-      dbrepo-broker-service:
-        condition: service_started
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-container-service:
-    restart: "no"
-    container_name: dbrepo-container-service
-    hostname: container-service
-    image: dbrepo/container-service:latest
-    networks:
-      core:
-    env_file:
-      - .env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    depends_on:
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-authentication-service:
-    restart: "no"
-    container_name: dbrepo-authentication-service
-    hostname: authentication-service
-    image: dbrepo/authentication-service:latest
-    networks:
-      core:
-    ports:
-      - "8443:8443"
-      - "8080:8080"
-    env_file:
-      - .env
-    volumes:
-      - authentication-service-data:/opt/keycloak/data/
-    depends_on:
-      dbrepo-metadata-db:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-query-service:
-    restart: "no"
-    container_name: dbrepo-query-service
-    hostname: query-service
-    image: dbrepo/query-service:latest
-    networks:
-      core:
-      userdb:
-    env_file:
-      - .env
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-    depends_on:
-      dbrepo-broker-service:
-        condition: service_healthy
-      dbrepo-table-service:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-table-service:
-    restart: on-failure
-    container_name: dbrepo-table-service
-    hostname: table-service
-    image: dbrepo/table-service:latest
-    networks:
-      core:
-      userdb:
-    env_file:
-      - .env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ${SHARED_FILESYSTEM}:/tmp
-    depends_on:
-      dbrepo-authentication-service:
-        condition: service_healthy
-      dbrepo-search-db:
-        condition: service_started
-      dbrepo-broker-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-identifier-service:
-    restart: "no"
-    container_name: dbrepo-identifier-service
-    hostname: identifier-service
-    image: dbrepo/identifier-service:latest
-    networks:
-      core:
-    env_file:
-      - .env
-    environment:
-      - SPRING_PROFILES_ACTIVE=doi
-    depends_on:
-      dbrepo-query-service:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-    logging:
-      driver: json-file
-
-  dbrepo-metadata-service:
-    restart: "no"
-    container_name: dbrepo-metadata-service
-    hostname: metadata-service
-    image: dbrepo/metadata-service:latest
-    networks:
-      core:
-    env_file:
-      - .env
-    depends_on:
-      dbrepo-authentication-service:
-        condition: service_healthy
-      dbrepo-metadata-db:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-analyse-service:
-    restart: "no"
-    container_name: dbrepo-analyse-service
-    hostname: analyse-service
-    image: dbrepo/analyse-service:latest
-    networks:
-      core:
-      userdb:
-    env_file:
-      - .env
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-      - /var/run/docker.sock:/var/run/docker.sock
-    logging:
-      driver: json-file
-
-  dbrepo-user-service:
-    restart: "no"
-    container_name: dbrepo-user-service
-    hostname: user-service
-    image: dbrepo/user-service:latest
-    networks:
-      core:
-    ports:
-      - "9098:9098"
-    env_file:
-      - .env
-    depends_on:
-      dbrepo-metadata-db:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-semantics-service:
-    restart: "no"
-    container_name: dbrepo-semantics-service
-    hostname: semantics-service
-    image: dbrepo/semantics-service:latest
-    networks:
-      core:
-    env_file:
-      - .env
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-      - /var/run/docker.sock:/var/run/docker.sock
-    depends_on:
-      dbrepo-metadata-db:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-broker-service:
-    restart: "no"
-    container_name: dbrepo-broker-service
-    hostname: broker-service
-    image: dbrepo/broker-service:latest
-    networks:
-      core:
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-    env_file:
-      - .env
-    depends_on:
-      dbrepo-authentication-service:
-        condition: service_healthy
-    volumes:
-      - broker-service-data:/var/lib/rabbitmq/
-    logging:
-      driver: json-file
-
-  dbrepo-search-db:
-    restart: always
-    container_name: dbrepo-search-db
-    hostname: search-db
-    image: elasticsearch:8.7.1
-    networks:
-      core:
-    env_file:
-      - .env
-    environment:
-      discovery.type: "single-node"
-      ES_JAVA_OPTS: "-Xms2g -Xmx2g"
-      logger.level: "WARN"
-      bootstrap.memory_lock: "true"
-      xpack.security.enabled: "true"
-    volumes:
-      - search-db-data:/usr/share/elasticsearch/data
-    logging:
-      driver: json-file
-
-  dbrepo-ui:
-    restart: "no"
-    container_name: dbrepo-ui
-    hostname: ui
-    image: dbrepo/ui:latest
-    networks:
-      core:
-      public:
-    env_file:
-      - .env
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-    depends_on:
-      dbrepo-identifier-service:
-        condition: service_healthy
-      dbrepo-database-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-gateway-service:
-    restart: "no"
-    container_name: dbrepo-gateway-service
-    hostname: gateway-service
-    image: nginx:1.25-alpine-slim
-    networks:
-      core:
-      public:
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - /etc/letsencrypt/live/dbrepo2.ec.tuwien.ac.at/fullchain.pem:/etc/nginx/fullchain.pem:ro
-      - /etc/letsencrypt/live/dbrepo2.ec.tuwien.ac.at/privkey.pem:/etc/nginx/privkey.pem:ro
-      - /home/demo/dbrepo-tuw/proxy/dbrepo.conf:/etc/nginx/conf.d/default.conf
-      - /home/demo/dbrepo-tuw/proxy/ssl_passwords.txt:/etc/nginx/ssl_passwords.txt
-    depends_on:
-      dbrepo-analyse-service:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-      dbrepo-broker-service:
-        condition: service_healthy
-      dbrepo-container-service:
-        condition: service_healthy
-      dbrepo-database-service:
-        condition: service_healthy
-      dbrepo-identifier-service:
-        condition: service_healthy
-      dbrepo-metadata-service:
-        condition: service_healthy
-      dbrepo-query-service:
-        condition: service_healthy
-      dbrepo-search-db:
-        condition: service_started
-      dbrepo-semantics-service:
-        condition: service_healthy
-      dbrepo-table-service:
-        condition: service_healthy
-      dbrepo-ui:
-        condition: service_started
-      dbrepo-user-service:
-        condition: service_healthy
-    logging:
-      driver: json-file

docker-compose.egi.yml

-# INFO: This compose file deploys the official Docker images from a staging, tested dev branch
-# MODIFIED: 2023-06-01
-# MAINTAINER: Martin Weise <martin.weise@tuwien.ac.at>
-
-version: "3.6"
-
-volumes:
-  metadata-db-data:
-  search-db-data:
-  broker-service-data:
-  authentication-service-data:
-
-networks:
-  public:
-    name: public
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.29.0.0/16
-  userdb:
-    name: userdb
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.28.0.0/16
-  core:
-    name: core
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.27.0.0/16
-
-services:
-
-  dbrepo-metadata-db:
-    restart: "no"
-    container_name: dbrepo-metadata-db
-    hostname: metadata-db
-    image: dbrepo/metadata-db:latest
-    networks:
-      core:
-    volumes:
-      - metadata-db-data:/var/lib/mysql
-    ports:
-      - "3306:3306"
-      - "9100:9100"
-    env_file:
-      - .env
-    logging:
-      driver: json-file
-
-  dbrepo-database-service:
-    restart: "no"
-    container_name: dbrepo-database-service
-    hostname: database-service
-    image: dbrepo/database-service:latest
-    networks:
-      userdb:
-      core:
-    env_file:
-      - .env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    depends_on:
-      dbrepo-container-service:
-        condition: service_healthy
-      dbrepo-broker-service:
-        condition: service_started
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-container-service:
-    restart: "no"
-    container_name: dbrepo-container-service
-    hostname: container-service
-    image: dbrepo/container-service:latest
-    networks:
-      core:
-    env_file:
-      - .env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    depends_on:
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-authentication-service:
-    restart: "no"
-    container_name: dbrepo-authentication-service
-    hostname: authentication-service
-    image: dbrepo/authentication-service:latest
-    networks:
-      core:
-    ports:
-      - "8443:8443"
-      - "8080:8080"
-    env_file:
-      - .env
-    volumes:
-      - authentication-service-data:/opt/keycloak/data/
-    depends_on:
-      dbrepo-metadata-db:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-query-service:
-    restart: "no"
-    container_name: dbrepo-query-service
-    hostname: query-service
-    image: dbrepo/query-service:latest
-    networks:
-      core:
-      userdb:
-    env_file:
-      - .env
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-    depends_on:
-      dbrepo-broker-service:
-        condition: service_healthy
-      dbrepo-table-service:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-table-service:
-    restart: on-failure
-    container_name: dbrepo-table-service
-    hostname: table-service
-    image: dbrepo/table-service:latest
-    networks:
-      core:
-      userdb:
-    env_file:
-      - .env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ${SHARED_FILESYSTEM}:/tmp
-    depends_on:
-      dbrepo-authentication-service:
-        condition: service_healthy
-      dbrepo-search-db:
-        condition: service_started
-      dbrepo-broker-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-identifier-service:
-    restart: "no"
-    container_name: dbrepo-identifier-service
-    hostname: identifier-service
-    image: dbrepo/identifier-service:latest
-    networks:
-      core:
-    env_file:
-      - .env
-    environment:
-      - SPRING_PROFILES_ACTIVE=doi
-    depends_on:
-      dbrepo-query-service:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-    logging:
-      driver: json-file
-
-  dbrepo-metadata-service:
-    restart: "no"
-    container_name: dbrepo-metadata-service
-    hostname: metadata-service
-    image: dbrepo/metadata-service:latest
-    networks:
-      core:
-    env_file:
-      - .env
-    depends_on:
-      dbrepo-authentication-service:
-        condition: service_healthy
-      dbrepo-metadata-db:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-analyse-service:
-    restart: "no"
-    container_name: dbrepo-analyse-service
-    hostname: analyse-service
-    image: dbrepo/analyse-service:latest
-    networks:
-      core:
-      userdb:
-    env_file:
-      - .env
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-      - /var/run/docker.sock:/var/run/docker.sock
-    logging:
-      driver: json-file
-
-  dbrepo-user-service:
-    restart: "no"
-    container_name: dbrepo-user-service
-    hostname: user-service
-    image: dbrepo/user-service:latest
-    networks:
-      core:
-    ports:
-      - "9098:9098"
-    env_file:
-      - .env
-    depends_on:
-      dbrepo-metadata-db:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-semantics-service:
-    restart: "no"
-    container_name: dbrepo-semantics-service
-    hostname: semantics-service
-    image: dbrepo/semantics-service:latest
-    networks:
-      core:
-    env_file:
-      - .env
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-      - /var/run/docker.sock:/var/run/docker.sock
-    depends_on:
-      dbrepo-metadata-db:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-broker-service:
-    restart: "no"
-    container_name: dbrepo-broker-service
-    hostname: broker-service
-    image: dbrepo/broker-service:latest
-    networks:
-      core:
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-    env_file:
-      - .env
-    depends_on:
-      dbrepo-authentication-service:
-        condition: service_healthy
-    volumes:
-      - broker-service-data:/var/lib/rabbitmq/
-    logging:
-      driver: json-file
-
-  dbrepo-search-db:
-    restart: always
-    container_name: dbrepo-search-db
-    hostname: search-db
-    image: elasticsearch:8.7.1
-    networks:
-      core:
-    env_file:
-      - .env
-    environment:
-      discovery.type: "single-node"
-      ES_JAVA_OPTS: "-Xms2g -Xmx2g"
-      logger.level: "WARN"
-      bootstrap.memory_lock: "true"
-      xpack.security.enabled: "true"
-    volumes:
-      - search-db-data:/usr/share/elasticsearch/data
-    logging:
-      driver: json-file
-
-  dbrepo-ui:
-    restart: "no"
-    container_name: dbrepo-ui
-    hostname: ui
-    image: dbrepo/ui:latest
-    networks:
-      core:
-      public:
-    env_file:
-      - .env
-    volumes:
-      - ${SHARED_FILESYSTEM}:/tmp
-    depends_on:
-      dbrepo-identifier-service:
-        condition: service_healthy
-      dbrepo-database-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
-  dbrepo-gateway-service:
-    restart: "no"
-    container_name: dbrepo-gateway-service
-    hostname: gateway-service
-    image: nginx:1.25-alpine-slim
-    networks:
-      core:
-      public:
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - /etc/letsencrypt/live/dbrepo.vm.fedcloud.eu/fullchain.pem:/etc/nginx/fullchain.pem:ro
-      - /etc/letsencrypt/live/dbrepo.vm.fedcloud.eu/privkey.pem:/etc/nginx/privkey.pem:ro
-      - /home/ubuntu/dbrepo.conf:/etc/nginx/conf.d/default.conf
-      - /home/ubuntu/ssl_passwords.txt:/etc/nginx/ssl_passwords.txt
-    depends_on:
-      dbrepo-analyse-service:
-        condition: service_healthy
-      dbrepo-authentication-service:
-        condition: service_healthy
-      dbrepo-broker-service:
-        condition: service_healthy
-      dbrepo-container-service:
-        condition: service_healthy
-      dbrepo-database-service:
-        condition: service_healthy
-      dbrepo-identifier-service:
-        condition: service_healthy
-      dbrepo-metadata-service:
-        condition: service_healthy
-      dbrepo-query-service:
-        condition: service_healthy
-      dbrepo-search-db:
-        condition: service_started
-      dbrepo-semantics-service:
-        condition: service_healthy
-      dbrepo-table-service:
-        condition: service_healthy
-      dbrepo-ui:
-        condition: service_started
-      dbrepo-user-service:
-        condition: service_healthy
-    logging:
-      driver: json-file

docker-compose.prod.yml

@@ -11,24 +11,24 @@ volumes:
   authentication-service-data:
 
 networks:
-  public:
-    name: public
+  userdb:
+    name: userdb
     driver: bridge
     ipam:
       config:
-        - subnet: 172.29.0.0/16
-  userdb:
-    name: userdb
+        - subnet: 172.30.0.0/16
+  public:
+    name: public
     driver: bridge
     ipam:
       config:
-        - subnet: 172.28.0.0/16
+        - subnet: 172.31.0.0/16
   core:
     name: core
     driver: bridge
     ipam:
       config:
-        - subnet: 172.27.0.0/16
+        - subnet: 172.32.0.0/16
 
 services:
 
@@ -36,7 +36,7 @@ services:
     restart: "no"
     container_name: dbrepo-metadata-db
     hostname: metadata-db
-    image: dbrepo/metadata-db:1.2
+    image: dbrepo/metadata-db:1.3
     networks:
       core:
     volumes:
@@ -53,10 +53,12 @@ services:
     restart: "no"
     container_name: dbrepo-database-service
     hostname: database-service
-    image: dbrepo/database-service:1.2
+    image: dbrepo/database-service:1.3
     networks:
       userdb:
       core:
+    ports:
+      - "9092:9092"
     env_file:
       - .env
     volumes:
@@ -75,9 +77,11 @@ services:
     restart: "no"
     container_name: dbrepo-container-service
     hostname: container-service
-    image: dbrepo/container-service:1.2
+    image: dbrepo/container-service:1.3
     networks:
       core:
+    ports:
+      - "9091:9091"
     env_file:
       - .env
     volumes:
@@ -92,7 +96,7 @@ services:
     restart: "no"
     container_name: dbrepo-authentication-service
     hostname: authentication-service
-    image: dbrepo/authentication-service:1.2
+    image: dbrepo/authentication-service:1.3
     networks:
       core:
     ports:
@@ -112,7 +116,7 @@ services:
     restart: "no"
     container_name: dbrepo-query-service
     hostname: query-service
-    image: dbrepo/query-service:1.2
+    image: dbrepo/query-service:1.3
     networks:
       core:
       userdb:
@@ -131,13 +135,15 @@ services:
       driver: json-file
 
   dbrepo-table-service:
-    restart: on-failure
+    restart: "no"
     container_name: dbrepo-table-service
     hostname: table-service
-    image: dbrepo/table-service:1.2
+    image: dbrepo/table-service:1.3
     networks:
       core:
       userdb:
+    ports:
+      - "9094:9094"
     env_file:
       - .env
     volumes:
@@ -157,9 +163,11 @@ services:
     restart: "no"
     container_name: dbrepo-identifier-service
     hostname: identifier-service
-    image: dbrepo/identifier-service:1.2
+    image: dbrepo/identifier-service:1.3
     networks:
       core:
+    ports:
+      - "9096:9096"
     env_file:
       - .env
     depends_on:
@@ -176,11 +184,13 @@ services:
     restart: "no"
     container_name: dbrepo-metadata-service
     hostname: metadata-service
-    image: dbrepo/metadata-service:1.2
+    image: dbrepo/metadata-service:1.3
     networks:
       core:
     env_file:
       - .env
+    ports:
+      - "9099:9099"
     depends_on:
       dbrepo-authentication-service:
         condition: service_healthy
@@ -193,7 +203,7 @@ services:
     restart: "no"
     container_name: dbrepo-analyse-service
     hostname: analyse-service
-    image: dbrepo/analyse-service:1.2
+    image: dbrepo/analyse-service:1.3
     networks:
       core:
       userdb:
@@ -209,7 +219,7 @@ services:
     restart: "no"
     container_name: dbrepo-user-service
     hostname: user-service
-    image: dbrepo/user-service:1.2
+    image: dbrepo/user-service:1.3
     networks:
       core:
     ports:
@@ -228,9 +238,11 @@ services:
     restart: "no"
     container_name: dbrepo-semantics-service
     hostname: semantics-service
-    image: dbrepo/semantics-service:1.2
+    image: dbrepo/semantics-service:1.3
     networks:
       core:
+    ports:
+      - "9097:9097"
     env_file:
       - .env
     volumes:
@@ -248,11 +260,12 @@ services:
     restart: "no"
     container_name: dbrepo-broker-service
     hostname: broker-service
-    image: dbrepo/broker-service:1.2
+    image: dbrepo/broker-service:1.3
     networks:
       core:
     ports:
       - "5672:5672"
+      - "15672:15672"
     env_file:
       - .env
     depends_on:
@@ -270,6 +283,8 @@ services:
     image: elasticsearch:8.7.1
     networks:
       core:
+    ports:
+      - 9200:9200
     env_file:
       - .env
     environment:
@@ -287,12 +302,10 @@ services:
     restart: "no"
     container_name: dbrepo-ui
     hostname: ui
-    image: dbrepo/ui:1.2
+    image: dbrepo/ui:1.3
     networks:
       core:
       public:
-    ports:
-      - "3000:3000"
     env_file:
       - .env
     volumes:

docker-compose.yml

@@ -309,7 +309,6 @@ services:
       logger.level: "WARN"
       bootstrap.memory_lock: "true"
       xpack.security.enabled: "true"
-      ELASTIC_PASSWORD: "elastic"
     volumes:
       - search-db-data:/usr/share/elasticsearch/data
     logging: