Merge branch 'dev' into 98-Error-querying-Table

Former-commit-id: ebd9d8a1

Merge branch 'dev' into 98-Error-querying-Table
5d6c6867 · Martin Weise · 67042a0b · ded884b9 · 67042a0b · 5d6c6867
Commit 5d6c6867 authored Nov 29, 2021 by Martin Weise
--- a/.docker/release
+++ b/.docker/release
-#!/bin/bash
-
-USER="fairdataaustria"
-VERSION=$1
-
-# usage
-if [ $# -ne 1 ]; then
-  echo "USAGE: ./release VERSION"
-  echo "                 (e.g. 1.0.0-alpha)"
-  exit 1
-fi
-
-# check tag exists
-TAG=$(git tag -n | awk '{print $1}' | grep -o "^v${VERSION}\$")
-if [ -z $TAG ]; then
-  echo "FAIL: could not find version 'v${VERSION}' in git tags"
-  exit 2
-fi
-
-# build
-git checkout ${VERSION}
-docker-compose build fda-metadata-db
-docker-compose build --parallel
-
-# login
-echo "Authentication required for user ${USER} at docker.io (docker hub)"
-docker login docker.io -u $USER
-
-# tag
-IMAGE=$(ls -d fda-*)
-for DIR in $IMAGE
-do
-#  CHECK=$(docker images "${USER}/${IMAGE}:${VERSION}" -q)
-#  if [ ! -z $CHECK ]; then
-#    echo "CHECK ${DIR}: tag ${USER}/${IMAGE}:${VERSION} already exists locally"
-#    exit 3
-#  fi
-  echo "TAG ${DIR}"
-  docker tag ${IMAGE}:latest ${USER}/${IMAGE}:${VERSION}
-  docker push ${USER}/${IMAGE}:${VERSION}
-done
--- a/.env.example
+++ b/.env.example
+ZENODO_API_KEY=
+API=http://fda-gateway-service:9095
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,31 +18,90 @@ stages:
  - build
  - test-frontend
  - test-backend
+  - registry
+  - deploy
+
+build-backend-metadata:
+  stage: build
+  script:
+    - "make build-backend-metadata"
+
+build-backend-authentication:
+  stage: build
+  needs:
+    - build-backend-metadata
+  script:
+    - "make build-backend-authentication"
+
+build-backend-citation:
+  stage: build
+  needs:
+    - build-backend-metadata
+  script:
+    - "make build-backend-citation"
+
+build-backend-container:
+  stage: build
+  needs:
+    - build-backend-metadata
+  script:
+    - "make build-backend-container"
+
+build-backend-database:
+  stage: build
+  needs:
+    - build-backend-metadata
+  script:
+    - "make build-backend-database"
+
+build-backend-discovery:
+  stage: build
+  needs:
+    - build-backend-metadata
+  script:
+    - "make build-backend-discovery"
+
+build-backend-gateway:
+  stage: build
+  needs:
+    - build-backend-metadata
+  script:
+    - "make build-backend-gateway"
+
+build-backend-query:
+  stage: build
+  needs:
+    - build-backend-metadata
+  script:
+    - "make build-backend-query"
+
+build-backend-table:
+  stage: build
+  needs:
+    - build-backend-metadata
+  script:
+    - "make build-backend-table"

 build-docker:
  stage: build
  script:
-    - "docker image pull postgres:latest || true"
-    - "docker image pull mysql:latest || true"
-    - "docker image pull mariadb:latest || true"
-    - "docker image pull rabbitmq:3-alpine || true"
-    - "docker-compose down || true"
-    - "docker container stop $(docker container ls -aq) || true"
-    - "docker container rm $(docker container ls -aq) || true"
-    - "docker volume rm $(docker volume ls -q) || true"
-    - "docker-compose build"
-
-build-metadata-db:
+    - make build-docker
+
+build-frontend:
  stage: build
  script:
-    - "mvn -f fda-metadata-db/pom.xml clean install" # local maven2 repository
+    - make build-frontend

-test-frontend-ui:
+test-frontend:
  stage: test-frontend
+  dependencies:
+    - build-docker
+    - build-frontend
+  needs:
+    - build-docker
+    - build-frontend
  script:
-    - "npm --prefix ./fda-ui install"
-    - "docker-compose up -d"
-    - "npm --prefix ./fda-ui run test"
+    - make test-frontend
  artifacts:
    when: always
    paths:
@@ -53,15 +112,13 @@ test-frontend-ui:

 test-backend-container:
  stage: test-backend
-  script:
-    - "./fda-container-service/rest-service/src/test/resources/integration-test.before"
-    - "mvn -f fda-container-service/pom.xml clean test verify"
-    - "./fda-container-service/rest-service/src/test/resources/integration-test.after"
-    - cat ./fda-container-service/report/target/site/jacoco-aggregate/index.html
  needs:
-    - build-metadata-db
+    - build-backend-container
  dependencies:
-    - build-metadata-db
+    - build-backend-container
+  script:
+    - make test-backend-container
+    - cat ./fda-container-service/report/target/site/jacoco-aggregate/index.html
  artifacts:
    when: always
    paths:
@@ -73,15 +130,13 @@ test-backend-container:

 test-backend-database:
  stage: test-backend
-  script:
-    - "./fda-database-service/rest-service/src/test/resources/integration-test.before"
-    - "mvn -f fda-database-service/pom.xml clean test verify"
-    - "./fda-database-service/rest-service/src/test/resources/integration-test.after"
-    - cat ./fda-database-service/report/target/site/jacoco-aggregate/index.html
  needs:
-    - build-metadata-db
+    - build-backend-database
  dependencies:
-    - build-metadata-db
+    - build-backend-database
+  script:
+    - mvn -f fda-database-service/pom.xml clean test verify
+    - cat ./fda-database-service/report/target/site/jacoco-aggregate/index.html
  artifacts:
    when: always
    paths:
@@ -93,25 +148,49 @@ test-backend-database:

 test-backend-discovery:
  stage: test-backend
+  needs:
+    - build-backend-discovery
+  dependencies:
+    - build-backend-discovery
  script:
-    - "mvn -f fda-discovery-service/pom.xml clean test verify"
+    - mvn -f fda-discovery-service/pom.xml clean test verify
+    - cat ./fda-discovery-service/report/target/site/jacoco-aggregate/index.html
+  artifacts:
+    when: always
+    paths:
+      - fda-discovery-service/rest-service/target/site/jacoco/jacoco.xml
+      - fda-discovery-service/rest-service/target/site/jacoco/index.html
+    reports:
+      junit:
+        - fda-discovery-service/rest-service/target/surefire-reports/TEST-*.xml

 test-backend-gateway:
  stage: test-backend
+  needs:
+    - build-backend-gateway
+  dependencies:
+    - build-backend-gateway
  script:
-    - "mvn -f fda-gateway-service/pom.xml clean test verify"
+    - mvn -f fda-gateway-service/pom.xml clean test verify
+    - cat ./fda-gateway-service/report/target/site/jacoco-aggregate/index.html
+  artifacts:
+    when: always
+    paths:
+      - fda-gateway-service/rest-service/target/site/jacoco/jacoco.xml
+      - fda-gateway-service/rest-service/target/site/jacoco/index.html
+    reports:
+      junit:
+        - fda-gateway-service/rest-service/target/surefire-reports/TEST-*.xml

 test-backend-query:
  stage: test-backend
-  script:
-    - "./fda-query-service/rest-service/src/test/resources/integration-test.before"
-    - "mvn -f fda-query-service/pom.xml clean test verify"
-    - "./fda-query-service/rest-service/src/test/resources/integration-test.after"
-    - cat ./fda-query-service/report/target/site/jacoco-aggregate/index.html
  needs:
-    - build-metadata-db
+    - build-backend-query
  dependencies:
-    - build-metadata-db
+    - build-backend-query
+  script:
+    - mvn -f fda-query-service/pom.xml clean test verify
+    - cat ./fda-query-service/report/target/site/jacoco-aggregate/index.html
  artifacts:
    when: always
    paths:
@@ -123,15 +202,13 @@ test-backend-query:

 test-backend-table:
  stage: test-backend
-  script:
-    - "./fda-table-service/rest-service/src/test/resources/integration-test.before"
-    - "mvn -f fda-table-service/pom.xml clean test verify"
-    - "./fda-table-service/rest-service/src/test/resources/integration-test.after"
-    - cat ./fda-table-service/report/target/site/jacoco-aggregate/index.html
  needs:
-    - build-metadata-db
+    - build-backend-table
  dependencies:
-    - build-metadata-db
+    - build-backend-table
+  script:
+    - mvn -f fda-table-service/pom.xml clean test verify
+    - cat ./fda-table-service/report/target/site/jacoco-aggregate/index.html
  artifacts:
    when: always
    paths:
@@ -143,15 +220,13 @@ test-backend-table:

 test-backend-citation:
  stage: test-backend
+  needs:
+    - build-backend-citation
+  dependencies:
+    - build-backend-citation
  script:
-    - ./fda-citation-service/rest-service/src/test/resources/integration-test.before
    - "ZENODO_API_KEY=${ZENODO_API_KEY} mvn -f fda-citation-service/pom.xml clean test verify"
-    - ./fda-citation-service/rest-service/src/test/resources/integration-test.after
    - cat ./fda-citation-service/report/target/site/jacoco-aggregate/index.html
-  needs:
-    - build-metadata-db
-  dependencies:
-    - build-metadata-db
  artifacts:
    when: always
    paths:
@@ -160,3 +235,92 @@ test-backend-citation:
    reports:
      junit:
        - fda-citation-service/rest-service/target/surefire-reports/TEST-*.xml
+
+test-backend-authentication:
+  stage: test-backend
+  needs:
+    - build-backend-authentication
+  dependencies:
+    - build-backend-authentication
+  script:
+    - mvn -f fda-authentication-service/pom.xml clean test verify
+    - cat ./fda-authentication-service/report/target/site/jacoco-aggregate/index.html
+  artifacts:
+    when: always
+    paths:
+      - fda-authentication-service/rest-service/target/site/jacoco/jacoco.xml
+      - fda-authentication-service/rest-service/target/site/jacoco/index.html
+    reports:
+      junit:
+        - fda-authentication-service/rest-service/target/surefire-reports/TEST-*.xml
+
+registry-stable:
+  stage: registry
+  only:
+    - master
+  needs:
+    - test-frontend
+    - test-backend-authentication
+    - test-backend-citation
+    - test-backend-container
+    - test-backend-database
+    - test-backend-discovery
+    - test-backend-gateway
+    - test-backend-query
+    - test-backend-table
+  dependencies:
+    - test-frontend
+    - test-backend-authentication
+    - test-backend-citation
+    - test-backend-container
+    - test-backend-database
+    - test-backend-discovery
+    - test-backend-gateway
+    - test-backend-query
+    - test-backend-table
+  script:
+    - make registry-stable
+
+registry-staging:
+  stage: registry
+  environment:
+    name: staging
+    url: https://staging.ossdip.at
+  only:
+    - dev
+  needs:
+    - test-frontend
+    - test-backend-authentication
+    - test-backend-citation
+    - test-backend-container
+    - test-backend-database
+    - test-backend-discovery
+    - test-backend-gateway
+    - test-backend-query
+    - test-backend-table
+  dependencies:
+    - test-frontend
+    - test-backend-authentication
+    - test-backend-citation
+    - test-backend-container
+    - test-backend-database
+    - test-backend-discovery
+    - test-backend-gateway
+    - test-backend-query
+    - test-backend-table
+  script:
+    - make registry-staging
+
+deploy-stable:
+  stage: deploy
+  environment:
+    name: stable
+    url: https://dbrepo.ossdip.at
+  only:
+    - master
+  needs:
+    - registry-stable
+  dependencies:
+    - registry-stable
+  script:
+    - make deploy-stable
--- a/.gitlab-ci/.mavenrc
+++ b/.gitlab-ci/.mavenrc
+JAVA_HOME="/usr/lib/jvm/jre-11-openjdk/"
\ No newline at end of file
--- a/.gitlab-ci/dependencies
+++ b/.gitlab-ci/dependencies
+#!/bin/bash
+sudo dnf install -y git vim net-tools chromium libdrm maven make java-11-openjdk java-11-openjdk-devel crontabs
+sudo dnf module install -y nodejs:14
\ No newline at end of file
--- a/.gitlab-ci/deploy
+++ b/.gitlab-ci/deploy
+#!/bin/bash
+scp ./.rhel-prod/install_cert dbrepo.ossdip.at:
+scp ./.rhel-prod/docker-compose.yml dbrepo.ossdip.at:
+ssh dbrepo.ossdip.at "docker-compose down"
+ssh dbrepo.ossdip.at "ENV=${ENV} ./install_cert"
+ssh dbrepo.ossdip.at "ENV=${ENV} docker-compose up -d"
\ No newline at end of file
--- a/.gitlab-ci/frontend/install_cert
+++ b/.gitlab-ci/frontend/install_cert
+#!/bin/bash
+CA_PATH="/etc/letsencrypt/live/dbrepo.ossdip.at"
+CERT_PATH="./fda-ui/.prod/"
+USER="rocky"
+
+if [ "$ENV" != "prod" ]; then
+  echo "WARN: environment must be prod"
+  exit 0
+fi
+
+sudo certbot certonly --standalone --preferred-challenges http -d dbrepo.ossdip.at \
+                -m martin.weise@tuwien.ac.at --agree-tos --keep-until-expiring
+
+sudo cp "${CA_PATH}/cert.pem" "${CERT_PATH}"
+sudo cp "${CA_PATH}/privkey.pem" "${CERT_PATH}"
+
+mv ./fda-ui/secure.conf ./fda-ui/.prod/default.conf
+
+mkdir -p "${CERT_PATH}"
+sudo chown -R "${USER}:docker" "${CERT_PATH}"
+
+ls -la "${CERT_PATH}"
--- a/.gitlab/license.svg
+++ b/.gitlab/license.svg
--- a/.gitlab/build-full
+++ b/.gitlab/build-full
-#!/bin/fish
-docker-compose down
-docker container stop (docker container ls -aq)
-docker container rm (docker container ls -aq)
-docker-compose build fda-metadata-db
-docker-compose build
-docker volume rm (docker volume ls -q)
--- a/.gitlab/calc-image-sizes
+++ b/.gitlab/calc-image-sizes
-#!/bin/bash
-SUM=$(docker image ls | grep "fda-" | awk '{print $7}' | grep -Po '\d{1,}' | awk '{s+=$1} END {print s}')
-echo "TOTAL fda-* image size ${SUM} MB"
\ No newline at end of file
--- a/.gitlab/gen-frontend-api
+++ b/.gitlab/gen-frontend-api
-# npm install -g swagger-node-codegen
\ No newline at end of file
--- a/.gitlab/gen-wiki
+++ b/.gitlab/gen-wiki
-#!/bin/bash
-
-# DESCRIPTION: script to generate the markdown documentation of some services for the wiki
-# WHEN: merge to master
-
-# dependencies
-docker pull quay.io/goswagger/swagger > /dev/null
-
-echo -e "\e[96m1\e[39m) Spin-up the services"
-docker-compose up -d > /dev/null  2>&1
-
-echo -e "\e[96m2\e[39m) Generate markdown documentations"
-
-echo "Generating docs for ./fda-container-service"
-wget http://localhost:9091/v2/api-docs -O swagger.json  > /dev/null 2>&1
-docker run --rm -it  --user $(id -u):$(id -g) -e GOPATH=$HOME/go:/go -v $HOME:$HOME -w $(pwd) quay.io/goswagger/swagger generate markdown --skip-validation -q
-mv markdown.md container.md
-
-echo "Generating docs for ./fda-database-service"
-wget http://localhost:9092/v2/api-docs -O swagger.json  > /dev/null 2>&1
-docker run --rm -it  --user $(id -u):$(id -g) -e GOPATH=$HOME/go:/go -v $HOME:$HOME -w $(pwd) quay.io/goswagger/swagger generate markdown --skip-validation -q
-mv markdown.md database.md
-
-echo "Generating docs for ./fda-query-service"
-wget http://localhost:9093/v2/api-docs -O swagger.json  > /dev/null 2>&1
-docker run --rm -it  --user $(id -u):$(id -g) -e GOPATH=$HOME/go:/go -v $HOME:$HOME -w $(pwd) quay.io/goswagger/swagger generate markdown --skip-validation -q
-mv markdown.md query.md
-
-echo "Generating docs for ./fda-table-service"
-wget http://localhost:9094/v2/api-docs -O swagger.json  > /dev/null 2>&1
-docker run --rm -it  --user $(id -u):$(id -g) -e GOPATH=$HOME/go:/go -v $HOME:$HOME -w $(pwd) quay.io/goswagger/swagger generate markdown --skip-validation -q
-mv markdown.md table.md
\ No newline at end of file
--- a/.gitlab/pre-merge-test
+++ b/.gitlab/pre-merge-test
-#!/bin/bash
-
-# DESCRIPTION: script to check if the current code base passes all tests before submitting to pipeline
-# WHEN: merge to dev, master
-
-SERVICES="container
-          database
-          discovery
-          gateway
-          query
-          table"
-
-# 1) Docker
-echo -e "\e[96m1\e[39m) Docker"
-echo "Building all"
-docker-compose build > /dev/null 2>&1
-
-if [[ $? -ne 0 ]]; then
-  echo -e "... \e[91mNOT OK\e[39m"
-else
-  echo -e "... \e[92mOK\e[39m"
-fi
-
-# 2) Maven
-echo -e "\e[96m2\e[39m) Maven"
-
-mvn -f ./fda-metadata-db/pom.xml clean install > /dev/null 2>&1
-
-for service in $SERVICES; do
-  echo "Testing ./fda-${service}-service"
-  RESULT=$(mvn -f "./fda-${service}-service/pom.xml" clean test verify | grep -o "FAILURE")
-  if [[ $RESULT ]]; then
-    echo -e "... \e[91mNOT OK\e[39m"
-  else
-    echo -e "... \e[92mOK\e[39m"
-  fi
-done
-
-# 3) Runtime
-echo -e "\e[96m3\e[39m) Runtime"
-echo "Execute Docker runtime, look for errors"
-docker-compose up
--- a/.rhel-prod/crontab
+++ b/.rhel-prod/crontab
+0 2 * * *       /usr/bin/make -C /home/rocky/fda-services teardown
+1 2 * * *       /usr/bin/make -C /home/rocky/fda-services run
\ No newline at end of file
--- a/.rhel-prod/docker-compose.yml
+++ b/.rhel-prod/docker-compose.yml
+version: "3.6"
+
+volumes:
+  fda-metadata-db-data:
+  fda-broker-service-data:
+
+networks:
+  fda-public:
+    name: fda-public
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 172.29.0.0/16
+    driver_opts:
+      com.docker.network.driver.mtu: 1450
+  fda-userdb:
+    name: fda-userdb
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 172.28.0.0/16
+    driver_opts:
+      com.docker.network.driver.mtu: 1450
+
+services:
+
+  fda-metadata-db:
+    restart: on-failure
+    container_name: fda-metadata-db
+    hostname: fda-metadata-db
+    build:
+      context: ./fda-metadata-db
+      args:
+        CI_JOB_STAGE: "${CI_JOB_STAGE}"
+    image: fda-metadata-db
+    networks:
+      - fda-public
+    volumes:
+      - fda-metadata-db-data:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: fda
+
+  fda-discovery-service:
+    restart: on-failure
+    container_name: fda-discovery-service
+    hostname: fda-discovery-service
+    build:
+      context: ./fda-discovery-service
+      args:
+        CI_JOB_STAGE: "${CI_JOB_STAGE}"
+    image: fda-discovery-service
+    networks:
+      - fda-public
+    environment:
+      SPRING_PROFILES_ACTIVE: docker
+    ports:
+      - "9090:9090"
+
+  fda-gateway-service:
+    restart: on-failure
+    container_name: fda-gateway-service
+    hostname: fda-gateway-service
+    build:
+      context: ./fda-gateway-service
+      args:
+        CI_JOB_STAGE: "${CI_JOB_STAGE}"
+    image: fda-gateway-service
+    networks:
+      fda-public:
+        aliases:
+          - fda-gateway-service
+    environment:
+      SPRING_PROFILES_ACTIVE: docker
+    ports:
+      - "9095:9095"
+    depends_on:
+      fda-discovery-service:
+        condition: service_healthy
+    logging:
+      driver: json-file
+
+  fda-database-service:
+    restart: on-failure
+    container_name: fda-database-service
+    hostname: fda-database-service
+    build:
+      context: ./fda-database-service
+      args:
+        CI_JOB_STAGE: "${CI_JOB_STAGE}"
+    image: fda-database-service
+    networks:
+      - fda-userdb
+      - fda-public
+    environment:
+      SPRING_PROFILES_ACTIVE: docker
+    ports:
+      - "9092:9092"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    depends_on:
+      fda-discovery-service:
+        condition: service_healthy
+      fda-broker-service:
+        condition: service_healthy
+      fda-metadata-db:
+        condition: service_healthy
+    logging:
+      driver: json-file
+
+  fda-container-service:
+    restart: on-failure
+    container_name: fda-container-service
+    hostname: fda-container-service
+    build:
+      context: ./fda-container-service
+      args:
+        CI_JOB_STAGE: "${CI_JOB_STAGE}"
+    image: fda-container-service
+    networks:
+      - fda-public
+    environment:
+      SPRING_PROFILES_ACTIVE: docker,seed
+    ports:
+      - "9091:9091"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    depends_on:
+      fda-discovery-service:
+        condition: service_healthy
+      fda-metadata-db:
+        condition: service_healthy
+    logging:
+      driver: json-file
+
+  fda-authentication-service:
+    restart: on-failure
+    container_name: fda-authentication-service
+    hostname: fda-authentication-service
+    build:
+      context: ./fda-authentication-service
+      args:
+        CI_JOB_STAGE: "${CI_JOB_STAGE}"
+    image: fda-authentication-service
+    networks:
+      - fda-public
+    volumes:
+      - /tmp:/tmp
+    environment:
+      SERVER_NAME: dbrepo.ossdip.at
+      SPRING_PROFILES_ACTIVE: docker
+      KEY_STORE_PASSWORD: ${KEY_STORE_PASSWORD}
+      KEY_STORE_LOCATION: /tmp/dbrepo.jks
+      KEY_STORE_TYPE: jks
+    ports:
+      - "9097:9097"
+    depends_on:
+      fda-discovery-service:
+        condition: service_healthy
+    logging:
+      driver: json-file
+
+  fda-query-service:
+    restart: on-failure
+    container_name: fda-query-service
+    hostname: fda-query-service
+    build:
+      context: ./fda-query-service
+      args:
+        CI_JOB_STAGE: "${CI_JOB_STAGE}"
+    image: fda-query-service
+    networks:
+      - fda-public
+      - fda-userdb
+    environment:
+      SPRING_PROFILES_ACTIVE: docker
+    ports:
+      - "9093:9093"
+    volumes:
+      - /tmp:/tmp
+    depends_on:
+      fda-discovery-service:
+        condition: service_healthy
+      fda-container-service:
+        condition: service_healthy
+      fda-metadata-db:
+        condition: service_healthy
+    logging:
+      driver: json-file
+
+  fda-table-service:
+    restart: on-failure
+    container_name: fda-table-service
+    hostname: fda-table-service
+    build:
+      context: ./fda-table-service
+      args:
+        CI_JOB_STAGE: "${CI_JOB_STAGE}"
+    image: fda-table-service
+    networks:
+      - fda-public
+      - fda-userdb
+    environment:
+      SPRING_PROFILES_ACTIVE: docker
+      multipart.location: /tmp
+    ports:
+      - "9094:9094"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /tmp:/tmp
+    depends_on:
+      fda-metadata-db:
+        condition: service_healthy
+      fda-discovery-service:
+        condition: service_healthy
+      fda-broker-service:
+        condition: service_healthy
+
+  fda-citation-service:
+    restart: on-failure
+    container_name: fda-citation-service
+    hostname: fda-citation-service
+    build:
+      context: ./fda-citation-service
+      args:
+        CI_JOB_STAGE: "${CI_JOB_STAGE}"
+    image: fda-citation-service
+    networks:
+      - fda-public
+    environment:
+      SPRING_PROFILES_ACTIVE: docker
+      ZENODO_API_KEY: "${ZENODO_API_KEY}"
+    ports:
+      - "9096:9096"
+    depends_on:
+      fda-metadata-db:
+        condition: service_healthy
+      fda-discovery-service:
+        condition: service_healthy
+      fda-table-service:
+        condition: service_healthy
+
+  fda-analyse-service:
+    restart: on-failure
+    container_name: fda-analyse-service
+    hostname: fda-analyse-service
+    build: ./fda-analyse-service
+    image: fda-analyse-service
+    networks:
+      - fda-public
+      - fda-userdb
+    command: sh -c "/wait && flask run" # docker-compose should not test the implementation
+    environment:
+      EUREKA_SERVER: http://fda-discovery-service:9090/eureka
+    ports:
+      - "5000:5000"
+    volumes:
+      - /tmp:/tmp
+      - /var/run/docker.sock:/var/run/docker.sock
+    depends_on:
+      fda-discovery-service:
+        condition: service_healthy
+      fda-database-service:
+        condition: service_healthy
+    logging:
+      driver: json-file
+
+  fda-broker-service:
+    restart: on-failure
+    container_name: fda-broker-service
+    hostname: fda-broker-service
+    build: ./fda-broker-service
+    image: fda-broker-service
+    networks:
+      - fda-public
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+    volumes:
+      - fda-broker-service-data:/var/lib/rabbitmq/
+
+  fda-search-service:
+    restart: always
+    container_name: fda-search-service
+    hostname: fda-search-service
+    image: elasticsearch:7.13.4
+    networks:
+      - fda-public
+    environment:
+      - discovery.type=single-node
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - logger.level=WARN
+    depends_on:
+      fda-discovery-service:
+        condition: service_healthy
+      fda-table-service:
+        condition: service_healthy
+    ports:
+      - "9200:9200"
+      - "9600:9600"
+
+  fda-ui:
+    restart: on-failure
+    container_name: fda-ui
+    hostname: fda-ui
+    build: ./fda-ui
+    image: fda-ui
+    networks:
+      - fda-public
+    ports:
+      - "443:443"
+      - "3000:3000"
+    volumes:
+      - /certs:/certs
+      - /tmp:/tmp
+    depends_on:
+      fda-gateway-service:
+        condition: service_healthy
+    environment:
+      HOST: 0.0.0.0
+      API: http://fda-gateway-service:9095
+      NGINX_PORT: "${NGINX_PORT:-3000}"
\ No newline at end of file
--- a/.rhel-prod/install_cert
+++ b/.rhel-prod/install_cert
+#!/bin/bash
+CERT_STORE_LOCATION="/tmp/cert.p12"
+KEY_STORE_LOCATION="/tmp/dbrepo.jks"
+KEY_STORE_PASS="dbrepo"
+CERT_LOCATION="/etc/letsencrypt/live/dbrepo.ossdip.at"
+
+# REQUEST
+sudo certbot certonly --standalone --preferred-challenges http -d dbrepo.ossdip.at \
+		-m martin.weise@tuwien.ac.at --agree-tos --keep-until-expiring
+
+# CONVERT PKCS12
+sudo openssl pkcs12 -export -out "${CERT_STORE_LOCATION}" -in "${CERT_LOCATION}/cert.pem" \
+  -inkey "${CERT_LOCATION}/privkey.pem" -passout "pass:${KEY_STORE_PASS}"
+
+# FIX PERMISSIONS
+sudo chmod 644 "${CERT_STORE_LOCATION}"
+
+# IMPORT
+keytool -importkeystore -deststorepass "${KEY_STORE_PASS}" -destkeypass "${KEY_STORE_PASS}" \
+  -destkeystore "${KEY_STORE_LOCATION}" -srckeystore "${CERT_STORE_LOCATION}" -srcstoretype PKCS12 \
+  -srcstorepass "${KEY_STORE_PASS}" -alias 1
\ No newline at end of file
--- a/.rhel-prod/teardown
+++ b/.rhel-prod/teardown
+#!/bin/bash
+docker container stop $(docker container ls -aq) || true
+docker container rm $(docker container ls -aq) || true
+docker volume rm $(docker volume ls -q) || true
\ No newline at end of file
--- a/fda-discovery-service/src/main/resources/config.properties
+++ b/fda-discovery-service/src/main/resources/config.properties
--- a/.rhel-registry/docker-compose.yml
+++ b/.rhel-registry/docker-compose.yml
+version: "3.6"
+
+services:
+
+  fda-registry-service:
+    restart: on-failure
+    container_name: fda-registry-service
+    hostname: fda-registry-service
+    image: registry:2
+    volumes:
+      - ./certs:/certs
+    ports:
+      - "443:443"
+      - "5000:5000"
+    environment:
+      REGISTRY_HTTP_ADDR: 0.0.0.0:443
+      REGISTRY_HTTP_TLS_CERTIFICATE: /certs/fullchain.pem
+      REGISTRY_HTTP_TLS_KEY: /certs/privkey.pem
--- a/.rhel-registry/install_cert
+++ b/.rhel-registry/install_cert
+#!/bin/bash
+CA_PATH="/etc/letsencrypt/live/docker.ossdip.at"
+CERT_PATH="./.rhel-registry/certs"
+USER="rocky"
+
+if [ "$ENV" != "prod" ]; then
+  echo "WARN: environment must be prod"
+  exit 0
+fi
+
+sudo certbot certonly --standalone --preferred-challenges http -d docker.ossdip.at \
+                -m martin.weise@tuwien.ac.at --agree-tos --keep-until-expiring
+
+sudo cp "${CA_PATH}/privkey.pem" "${CERT_PATH}"
+sudo cp "${CA_PATH}/fullchain.pem" "${CERT_PATH}"
+
+mkdir -p "${CERT_PATH}"
+sudo chown -R "${USER}:docker" "${CERT_PATH}"
+
+ls -la "${CERT_PATH}"