Merge branch 'master' into release-latest

.docs/build-website.sh

@@ -6,6 +6,8 @@ SCRIPTS_EXTRA_JS=""
 function generate_docs {
   BRANCH="release-$1"
   echo "==================================================="
+  echo "Removing cache from directory ./site"
+  rm -rf ./site
   echo "Building DOCS for version $1 on branch $BRANCH"
   echo "==================================================="
   git reset --hard && git checkout "$BRANCH"
@@ -29,6 +31,8 @@ function generate_docs {
 function generate_api {
   BRANCH="release-$1"
   echo "==================================================="
+  echo "Removing cache from directory ./site"
+  rm -rf ./site
   echo "Building API for version $1 on branch $BRANCH"
   echo "==================================================="
   git reset --hard && git checkout "$BRANCH"
@@ -39,11 +43,11 @@ function generate_api {
 }
 
 # usage
-if [ -z "$VERSIONS" ]; then
-    echo "Variable VERSIONS not set"
+if [ -z "$DOC_VERSIONS" ]; then
+    echo "Variable DOC_VERSIONS not set"
     exit 1
 fi
-versions=(${VERSIONS//,/ })
+versions=(${DOC_VERSIONS//,/ })
 
 # usage
 if [ -z "$APP_VERSION" ]; then

.gitlab-ci.yml

@@ -4,8 +4,9 @@ variables:
   TRIVY_CACHE_DIR: ".trivycache/"
   DOCKER_HOST: "unix:///var/run/dind/docker.sock"
   TESTCONTAINERS_RYUK_DISABLED: "false"
-  APP_VERSION: "1.4.0"
-  CHART_VERSION: "1.4.0"
+  DOC_VERSIONS: "latest,1.4.1,1.4.0,1.3.0"
+  APP_VERSION: "1.4.1"
+  CHART_VERSION: "1.4.1"
 
 image: debian:12-slim
 
@@ -458,182 +459,12 @@ scan-storage-service-init:
     reports:
       container_scanning: ./.trivy/trivy-storage-service-init-report.json
 
-release-latest:
-  stage: release
-  image: docker:24-dind
-  needs:
-    - test-metadata-service
-    - test-data-service
-    - test-analyse-service
-    - test-frontend
-  only:
-    refs:
-      - master
-  before_script:
-    - echo "$CI_REGISTRY_PASSWORD" | docker login --username "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY_URL
-    - echo "$CI_REGISTRY2_PASSWORD" | docker login --username "$CI_REGISTRY2_USER" --password-stdin $CI_REGISTRY2_URL
-  script:
-    - "ifconfig eth0 mtu 1450 up"
-    - "apk add make bash"
-    - TAG=latest make release
-
-release-1.3:
-  stage: release
-  image: docker:24-dind
-  needs:
-    - test-metadata-service
-    - test-data-service
-    - test-analyse-service
-    - test-frontend
-  only:
-    refs:
-      - release-v1.3
-  before_script:
-    - echo "$CI_REGISTRY_PASSWORD" | docker login --username "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY_URL
-    - echo "$CI_REGISTRY2_PASSWORD" | docker login --username "$CI_REGISTRY2_USER" --password-stdin $CI_REGISTRY2_URL
-  script:
-    - "ifconfig eth0 mtu 1450 up"
-    - "apk add make bash"
-    - "TAG=1.3.0 make release"
-
-release-1.4:
-  stage: release
-  image: docker:24-dind
-  needs:
-    - test-metadata-service
-    - test-data-service
-    - test-analyse-service
-    - test-frontend
-  only:
-    refs:
-      - release-v1.4
-  before_script:
-    - echo "$CI_REGISTRY_PASSWORD" | docker login --username "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY_URL
-    - echo "$CI_REGISTRY2_PASSWORD" | docker login --username "$CI_REGISTRY2_USER" --password-stdin $CI_REGISTRY2_URL
-  script:
-    - "ifconfig eth0 mtu 1450 up"
-    - "apk add make bash"
-    - "TAG=${APP_VERSION} make release"
-
-release-helm-1.4:
-  stage: release
-  image: docker:24-dind
-  only:
-    refs:
-      - release-v1.4
-  before_script:
-    - echo "$CI_REGISTRY2_PASSWORD" | docker login --username "$CI_REGISTRY2_USER" --password-stdin $CI_REGISTRY2_URL
-  script:
-    - apk add sed helm curl
-    - 'sed -i -e "s/^version:.*/version: \"${CHART_VERSION}\"/g" ./helm-charts/dbrepo/Chart.yaml'
-    - 'sed -i -e "s/^appVersion:.*/appVersion: \"${APP_VERSION}\"/g" ./helm-charts/dbrepo/Chart.yaml'
-    - find ./helm-charts -type f -exec sed -i -e "s/__CHARTVERSION__/${CHART_VERSION}/g" {} \;
-    - helm package ./helm-charts/dbrepo --destination ./build
-    - helm push "./build/dbrepo-${CHART_VERSION}.tgz" "oci://${CI_REGISTRY2_URL}/helm"
-
-build-api-latest:
-  stage: build
-  image: docker.io/alpine:3.18
-  only:
-    refs:
-      - master
-      - release-v1.3
-      - release-v1.4
-  script:
-    - apk add bash git
-    - git fetch && git checkout master
-    - bash .docs/.swagger/swagger-site.sh
-    - find ./site -type f -exec sed -i -e "s/__APPVERSION__/latest/g" {} \;
-    - mkdir -p ./swagger/latest
-    - cp -r ./site/* ./swagger/latest/
-  cache:
-    paths:
-      - ./swagger/latest
-  artifacts:
-    when: always
-    paths:
-      - ./swagger/latest
-    expire_in: 1 days
-
-build-api-1.3:
-  stage: build
-  image: docker.io/alpine:3.18
-  only:
-    refs:
-      - master
-      - release-v1.3
-      - release-v1.4
-  script:
-    - apk add bash git maven
-    - git fetch && git checkout release-v1.3
-    - bash .docs/.swagger/generate.sh
-    - mkdir -p ./swagger/1.3.0
-    - cp -r ./site/* ./swagger/1.3.0/
-  cache:
-    paths:
-      - ./swagger/1.3.0
-  artifacts:
-    when: always
-    paths:
-      - ./swagger/1.3.0
-    expire_in: 1 days
-
-build-api-1.4.0:
-  stage: build
-  image: docker.io/alpine:3.18
-  only:
-    refs:
-      - master
-      - release-v1.3
-      - release-v1.4
-  script:
-    - apk add bash git maven
-    - git fetch --tags && git checkout v1.4.0
-    - bash .docs/.swagger/swagger-site.sh
-    - find ./site -type f -exec sed -i -e "s/__APPVERSION__/1.4.0/g" {} \;
-    - mkdir -p ./swagger/1.4.0
-    - cp -r ./site/* ./swagger/1.4.0/
-  cache:
-    paths:
-      - ./swagger/1.4.0
-  artifacts:
-    when: always
-    paths:
-      - ./swagger/1.4.0
-    expire_in: 1 days
-
-build-api-1.4:
-  stage: build
-  image: docker.io/alpine:3.18
-  only:
-    refs:
-      - master
-      - release-v1.3
-      - release-v1.4
-  script:
-    - apk add bash git maven
-    - git fetch && git checkout release-v1.4
-    - bash .docs/.swagger/swagger-site.sh
-    - find ./site -type f -exec sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" {} \;
-    - mkdir -p ./swagger/${APP_VERSION}
-    - cp -r ./site/* ./swagger/${APP_VERSION}/
-  cache:
-    paths:
-      - ./swagger/${APP_VERSION}
-  artifacts:
-    when: always
-    paths:
-      - ./swagger/${APP_VERSION}
-    expire_in: 1 days
-
 docs-registry:
   stage: docs
   image: docker.io/python:3.11-slim
   only:
     refs:
-      - master
-      - release-v1.3
-      - release-v1.4
+      - /^release-.*/
   script:
     - pip install -r ./requirements.txt
     - python3 .docs/docker/release.py
@@ -646,57 +477,15 @@ docs-registry:
       - ./final
     expire_in: 1 days
 
-docs-latest:
+docs-docs:
   stage: docs
-  image: docker.io/python:3.9-slim
-  needs:
-    - build-api-latest
-    - build-api-1.3
-    - build-api-1.4
-  only:
-    refs:
-      - master
-      - release-v1.3
-      - release-v1.4
-  script:
-    - apt-get update && apt-get install -y git make sed
-    - git fetch && git checkout master
-    - pip install -r ./requirements.txt
-    - mkdir -p ./final
-    - sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" .docs/redirect.html
-    - cp ./.docs/redirect.html ./final/index.html
-    - find .docs/ -type f -exec sed -i -e "s/__APPVERSION__/latest/g" {} \;
-    - find .docs/ -type f -exec sed -i -e "s/__CHARTVERSION__/${CHART_VERSION}/g" {} \;
-    - mkdocs build && cp -r ./site ./final/latest
-    - cp -r ./swagger/latest ./final/latest/swagger
-  cache:
-    paths:
-      - ./final
-  artifacts:
-    when: always
-    paths:
-      - ./final
-    expire_in: 1 days
-
-docs-1.3:
-  stage: docs
-  image: docker.io/python:3.9-slim
-  needs:
-    - build-api-latest
-    - build-api-1.3
+  image: docker.io/python:3.11-slim
   only:
     refs:
-      - master
-      - release-v1.3
-      - release-v1.4
+      - /^release-.*/
   script:
-    - apt-get update && apt-get install -y git make wget
-    - git fetch && git checkout release-v1.3
-    - pip install -r ./requirements.txt
-    - wget https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/.docs/overrides/main.html -O .docs/overrides/main.html -q
-    - mkdir -p ./final
-    - mkdocs build && cp -r ./site ./final/1.3.0
-    - cp -r ./swagger/1.3.0 ./final/1.3.0/swagger
+    - apt-get update && apt-get install -y git make sed wget
+    - make docs
   cache:
     paths:
       - ./final
@@ -706,80 +495,49 @@ docs-1.3:
       - ./final
     expire_in: 1 days
 
-docs-1.4.0:
-  stage: docs
-  image: docker.io/python:3.11-slim
+release-images:
+  stage: release
+  image: docker:24-dind
   needs:
-    - build-api-latest
-    - build-api-1.3
-    - build-api-1.4
+    - test-metadata-service
+    - test-data-service
+    - test-analyse-service
+    - test-frontend
   only:
     refs:
-      - master
-      - release-v1.3
-      - release-v1.4
+      - /^release-.*/
+  before_script:
+    - echo "$CI_REGISTRY_PASSWORD" | docker login --username "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY_URL
+    - echo "$CI_REGISTRY2_PASSWORD" | docker login --username "$CI_REGISTRY2_USER" --password-stdin $CI_REGISTRY2_URL
   script:
-    - apt-get update && apt-get install -y git
-    - git fetch --tags && git checkout v1.4.0
-    - pip install -r ./requirements.txt
-    - wget https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/.docs/overrides/main.html -O .docs/overrides/main.html -q
-    - mkdir -p ./final
-    - find .docs/ -type f -exec sed -i -e "s/__APPVERSION__/1.4.0/g" {} \;
-    - find .docs/ -type f -exec sed -i -e "s/__CHARTVERSION__/1.4.0/g" {} \;
-    - mkdocs build && cp -r ./site ./final/1.4.0
-    - cp -r ./swagger/${APP_VERSION} ./final/1.4.0/swagger
-  cache:
-    paths:
-      - ./final
-  artifacts:
-    when: always
-    paths:
-      - ./final
-    expire_in: 1 days
+    - "ifconfig eth0 mtu 1450 up"
+    - "apk add make bash"
+    - "TAG=${APP_VERSION} make release"
 
-docs-1.4:
-  stage: docs
-  image: docker.io/python:3.11-slim
-  needs:
-    - build-api-latest
-    - build-api-1.3
-    - build-api-1.4
+release-chart:
+  stage: release
+  image: docker:24-dind
   only:
     refs:
-      - master
-      - release-v1.3
-      - release-v1.4
+      - /^release-.*/
+  before_script:
+    - echo "$CI_REGISTRY2_PASSWORD" | docker login --username "$CI_REGISTRY2_USER" --password-stdin $CI_REGISTRY2_URL
   script:
-    - apt-get update && apt-get install -y git make sed wget
-    - git fetch && git checkout release-v1.4
-    - pip install -r ./requirements.txt
-    - wget https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/.docs/overrides/main.html -O .docs/overrides/main.html -q
-    - mkdir -p ./final
-    - find .docs/ -type f -exec sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" {} \;
-    - find .docs/ -type f -exec sed -i -e "s/__CHARTVERSION__/${CHART_VERSION}/g" {} \;
-    - mkdocs build && cp -r ./site ./final/${APP_VERSION}
-    - cp -r ./swagger/${APP_VERSION} ./final/${APP_VERSION}/swagger
-  cache:
-    paths:
-      - ./final
-  artifacts:
-    when: always
-    paths:
-      - ./final
-    expire_in: 1 days
+    - apk add sed helm curl
+    - 'sed -i -e "s/^version:.*/version: \"${CHART_VERSION}\"/g" ./helm-charts/dbrepo/Chart.yaml'
+    - 'sed -i -e "s/^appVersion:.*/appVersion: \"${APP_VERSION}\"/g" ./helm-charts/dbrepo/Chart.yaml'
+    - find ./helm-charts -type f -exec sed -i -e "s/__CHARTVERSION__/${CHART_VERSION}/g" {} \;
+    - helm package ./helm-charts/dbrepo --destination ./build
+    - helm push "./build/dbrepo-${CHART_VERSION}.tgz" "oci://${CI_REGISTRY2_URL}/helm"
 
 release-docs:
   stage: release
   image: docker.io/finalgene/openssh:9.1
   needs:
-    - docs-latest
-    - docs-1.3
-    - docs-1.4
+    - docs-docs
   only:
     refs:
-      - master
-      - release-v1.3
-      - release-v1.4
+      - /^release-.*/
   script:
     - eval $(ssh-agent -s)
     - echo "$CI_KEY_PRIVATE" > /root/.ssh/id_rsa && chmod 0600 /root/.ssh/id_rsa

Dockerfile

-FROM python:3.11-slim as build
-
-WORKDIR /app
-
-RUN apt-get update && apt-get install -y git
-
-ENV VERSIONS="1.4.1,1.4.0,1.3.0"
-ENV APP_VERSION="1.4.1"
-
-COPY .git/ .git/
-COPY .docs/ .docs/
-COPY ./requirements.txt ./requirements.txt
-
-RUN bash .docs/build-website.sh
-
-FROM nginx as runtime
-
-WORKDIR /usr/share/nginx/html/infrastructures/dbrepo/
-
-COPY --from=build /app/final /usr/share/nginx/html/infrastructures/dbrepo/
\ No newline at end of file

Makefile

@@ -224,3 +224,6 @@ teardown:
 
 build-api:
 	bash .docs/.swagger/swagger-generate.sh
+
+docs:
+	bash .docs/build-website.sh
\ No newline at end of file

docker-compose.yml

@@ -10,13 +10,6 @@ volumes:
   storage-service-data:
 
 services:
-  website:
-    restart: "no"
-    image: website
-    build: .
-    ports:
-      - 8000:80
-
   dbrepo-metadata-db:
     restart: "no"
     container_name: dbrepo-metadata-db