diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f443942a46ef0a8331bd15fbc6514b65d5895136..905128a2479af4ccb25badcf60e285907b414e2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@
# the Helmholtz DataHub Initiative by GFZ and UFZ.
#
# Copyright (C) 2020-2021
+# - Wilhelm Becker (GFZ, wilhelm.becker@gfz-potsdam.de)
# - Nils Brinckmann (GFZ, nils.brinckmann@gfz-potsdam.de)
# - Marc Hanisch (GFZ, marc.hanisch@gfz-potsdam.de)
# - Helmholtz Centre Potsdam - GFZ German Research Centre for
@@ -105,13 +106,12 @@ test-frontend-unit-tests:
tags:
- docker
-build-deploy-image-gfz:
+build-deploy-static-files-gfz:
stage: build
extends: .docker_build
variables:
- SMS_BACKEND_URL: ${GFZ_STAGING_BACKEND_URL}/rdm/svm-api/v1
- CV_BACKEND_URL: ${GFZ_STAGING_SMS_CV_BACKEND_URL}/api/v1
- HOST: ${GFZ_STAGING_HOST}
+ SMS_BACKEND_URL: ${GFZ_STAGING_DEVELOP_BACKEND_URL}
+ CV_BACKEND_URL: ${GFZ_STAGING_DEVELOP_SMS_CV_URL}
CLIENT_ID: ${GFZ_STAGING_CLIENT_ID}
OIDC_REFRESH_TOKEN: "refresh_token"
OIDC_REFRESH_EXPIRE: 28800
@@ -124,92 +124,65 @@ build-deploy-image-gfz:
# we need to add a subpath for multiple endpoints
AUTHORITY: ${GFZ_STAGING_IDP_AUTORITY}/authorize
OIDC_TOKEN: ${GFZ_STAGING_IDP_AUTORITY}/accessToken
+ before_script:
+ - apk add --update curl python3 py3-pip && rm -rf /var/cache/apk/*
+ - pip install requests
script:
+ - TARGET_PACKAGE_VERSION=$(if [ -z "${CI_JOB_MANUAL}" ]; then echo "latest"; else echo "manual"; fi)
+ - echo "Build gfz statics ${TARGET_PACKAGE_VERSION}"
+ - docker build --tag "$CI_REGISTRY_IMAGE-static:gfz-${TARGET_PACKAGE_VERSION}" -f docker/deployment/gfz/Dockerfile .
- |
- if [ -z "$CI_COMMIT_TAG" ]; then
- docker build --pull --tag "$CI_REGISTRY_IMAGE:gfz-latest" -f docker/deployment/gfz/Dockerfile \
- --build-arg SMS_BACKEND_URL_ARG=$SMS_BACKEND_URL \
- --build-arg CV_BACKEND_URL_ARG=$CV_BACKEND_URL \
- --build-arg HOST_ARG=$HOST \
- --build-arg CLIENT_ID_ARG=$CLIENT_ID \
- --build-arg OIDC_REFRESH_TOKEN_ARG=$OIDC_REFRESH_TOKEN \
- --build-arg OIDC_REFRESH_EXPIRE_ARG=$OIDC_REFRESH_EXPIRE \
- --build-arg OIDC_RESPONSE_TYPE_ARG=$OIDC_RESPONSE_TYPE \
- --build-arg OIDC_GRANT_TYPE_ARG=$OIDC_GRANT_TYPE \
- --build-arg OIDC_CHALLANGE_ARG=$OIDC_CHALLANGE \
- --build-arg AUTHORITY_ARG=$AUTHORITY \
- --build-arg OIDC_TOKEN_ARG=$OIDC_TOKEN \
- --build-arg ALLOWED_MIME_TYPES_ARG=$ALLOWED_MIME_TYPES \
- .
- docker push "$CI_REGISTRY_IMAGE:gfz-latest"
- else
- docker build --pull --tag "$CI_REGISTRY_IMAGE:gfz-latest" --tag "$CI_REGISTRY_IMAGE:gfz-$CI_COMMIT_TAG" -f docker/deployment/gfz/Dockerfile \
- --build-arg SMS_BACKEND_URL_ARG=$SMS_BACKEND_URL \
- --build-arg CV_BACKEND_URL_ARG=$CV_BACKEND_URL \
- --build-arg HOST_ARG=$HOST \
- --build-arg CLIENT_ID_ARG=$CLIENT_ID \
- --build-arg OIDC_REFRESH_TOKEN_ARG=$OIDC_REFRESH_TOKEN \
- --build-arg OIDC_REFRESH_EXPIRE_ARG=$OIDC_REFRESH_EXPIRE \
- --build-arg OIDC_RESPONSE_TYPE_ARG=$OIDC_RESPONSE_TYPE \
- --build-arg OIDC_GRANT_TYPE_ARG=$OIDC_GRANT_TYPE \
- --build-arg OIDC_CHALLANGE_ARG=$OIDC_CHALLANGE \
- --build-arg AUTHORITY_ARG=$AUTHORITY \
- --build-arg OIDC_TOKEN_ARG=$OIDC_TOKEN \
- --build-arg ALLOWED_MIME_TYPES_ARG=$ALLOWED_MIME_TYPES \
- .
- docker push "$CI_REGISTRY_IMAGE:gfz-latest"
- docker push "$CI_REGISTRY_IMAGE:gfz-$CI_COMMIT_TAG"
- fi
+ docker run --name "static-gfz-${TARGET_PACKAGE_VERSION}-container-$CI_JOB_ID" \
+ --env BASE_URL="/${TARGET_PACKAGE_VERSION}" \
+ --env SMS_BACKEND_URL \
+ --env CV_BACKEND_URL \
+ --env INSTITUTE="gfz" \
+ --env NUXT_ENV_CLIENT_ID=$CLIENT_ID \
+ --env NUXT_ENV_AUTHORITY=$AUTHORITY \
+ --env NUXT_ENV_OIDC_TOKEN=$OIDC_TOKEN \
+ --env NUXT_ENV_OIDC_REFRESH_TOKEN=$OIDC_REFRESH_TOKEN \
+ --env NUXT_ENV_OIDC_REFRESH_EXPIRE=$OIDC_REFRESH_EXPIRE \
+ --env NUXT_ENV_OIDC_RESPONSE_TYPE=$OIDC_RESPONSE_TYPE \
+ --env NUXT_ENV_OIDC_GRANT_TYPE=$OIDC_GRANT_TYPE \
+ --env NUXT_ENV_OIDC_CHALLANGE=$OIDC_CHALLANGE \
+ --env NUXT_ENV_ALLOWED_MIMETYPES=$ALLOWED_MIME_TYPES \
+ --env NUXT_ENV_SCOPE="profile" \
+ ${CI_REGISTRY_IMAGE}-static:gfz-${TARGET_PACKAGE_VERSION}
+ # Use cp to avoid user missmatch with docker volumes
+ - docker cp "static-gfz-${TARGET_PACKAGE_VERSION}-container-$CI_JOB_ID":/smsfrontend/dist .
+ # Sign the tar and tar the tar with the signing txt file to enable checksum test for orch repository
+ - tar zcvf dist.tar.gz dist
+ - sha256sum dist.tar.gz > dist-sha256sum.txt
+ - cat dist-sha256sum.txt
+ - tar -cvf signed-dist.tar dist.tar.gz dist-sha256sum.txt
+ - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file signed-dist.tar "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gfz-statics/${TARGET_PACKAGE_VERSION}/signed-dist.tar"'
+ # Check sha256 sum
+ # Download the uploaded file until HZDR gitlab is updated to 14.3.5, which supports the the select attribute for generic packages
+ - sha256sum signed-dist.tar > signed-dist-sha256sum.txt
+ - cat signed-dist-sha256sum.txt
+ - rm signed-dist.tar
+ - 'wget --header="JOB-TOKEN: $CI_JOB_TOKEN" ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gfz-statics/${TARGET_PACKAGE_VERSION}/signed-dist.tar'
+ - sha256sum signed-dist.tar
+ - sha256sum -c signed-dist-sha256sum.txt
+ after_script:
+ - docker rm "static-gfz-${TARGET_PACKAGE_VERSION}-container-$CI_JOB_ID"
cache:
key: ${CI_COMMIT_REF_SLUG}
paths:
- node_modules
rules:
- - if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
-build-deploy-image-manual-gfz:
- stage: build
- extends: .docker_build
- variables:
- SMS_BACKEND_URL: ${GFZ_STAGING_BACKEND_URL}/rdm/svm-api/v1
- CV_BACKEND_URL: ${GFZ_STAGING_SMS_CV_BACKEND_URL}/api/v1
- HOST: ${GFZ_STAGING_HOST}:8080
- # Not sure, if we need another client id for the staging on 8080
- CLIENT_ID: ${GFZ_STAGING_CLIENT_ID}
- OIDC_REFRESH_TOKEN: "refresh_token"
- OIDC_REFRESH_EXPIRE: 28800
- OIDC_RESPONSE_TYPE: "code"
- OIDC_GRANT_TYPE: "authorization_code"
- OIDC_CHALLANGE: "S256"
- # The authority is a url like this:
- # https://idp.institute/cas/oidc
- # In order to make it work with the nuxt-auth plugin
- # we need to add a subpath for multiple endpoints
- AUTHORITY: ${GFZ_STAGING_IDP_AUTORITY}/authorize
- OIDC_TOKEN: ${GFZ_STAGING_IDP_AUTORITY}/accessToken
- script:
- - |
- docker build --tag "$CI_REGISTRY_IMAGE:gfz-$CI_COMMIT_SHORT_SHA" -f docker/deployment/gfz/Dockerfile \
- --build-arg SMS_BACKEND_URL_ARG=$SMS_BACKEND_URL \
- --build-arg CV_BACKEND_URL_ARG=$CV_BACKEND_URL \
- --build-arg HOST_ARG=$HOST \
- --build-arg CLIENT_ID_ARG=$CLIENT_ID \
- --build-arg OIDC_REFRESH_TOKEN_ARG=$OIDC_REFRESH_TOKEN \
- --build-arg OIDC_REFRESH_EXPIRE_ARG=$OIDC_REFRESH_EXPIRE \
- --build-arg OIDC_RESPONSE_TYPE_ARG=$OIDC_RESPONSE_TYPE \
- --build-arg OIDC_GRANT_TYPE_ARG=$OIDC_GRANT_TYPE \
- --build-arg OIDC_CHALLANGE_ARG=$OIDC_CHALLANGE \
- --build-arg AUTHORITY_ARG=$AUTHORITY \
- --build-arg OIDC_TOKEN_ARG=$OIDC_TOKEN \
- --build-arg ALLOWED_MIME_TYPES_ARG=$ALLOWED_MIME_TYPES \
- .
- - docker push "$CI_REGISTRY_IMAGE:gfz-$CI_COMMIT_SHORT_SHA"
- cache:
- key: ${CI_COMMIT_REF_SLUG}
- paths:
- - node_modules
- when: manual
+ # We want to be able to trigger the manual deployment from every branch
+ - if: $CI_PIPELINE_SOURCE == "push"
+ when: manual
+
+trigger-build-on-orchestration-gfz:
+ stage: deploy-staging
+ needs: ["build-deploy-static-files-gfz"]
+ trigger:
+ project: hub-terra/sms/orchestration
+ branch: main
+ strategy: depend
build-deploy-image-ufz:
stage: build
@@ -242,6 +215,9 @@ build-deploy-image-ufz:
key: ${CI_COMMIT_REF_SLUG}
paths:
- node_modules
+ rules:
+ - if: $CI_COMMIT_TAG
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
release-latest-deploy-image-ufz:
stage: release
@@ -267,47 +243,6 @@ release-tag-deploy-image-ufz:
- docker tag $UFZ_TEST_IMAGE $UFZ_GIT_TAG_RELEASE_IMAGE
- docker push $UFZ_GIT_TAG_RELEASE_IMAGE
-deploy-staging-gfz:
- stage: deploy-staging
- environment:
- name: gfzstaging
- url: http://$GFZ_STAGING_HOST
- tags:
- - deploy
- - staging
- - gfz
- - shell
- variables:
- COMPOSE_PROJECT_NAME: ssmfrontend
- before_script:
- - *docker_login_gitlab_registry
- script:
- - docker-compose -f docker/deployment/gfz/staging/docker-compose.yml pull
- - docker-compose -f docker/deployment/gfz/staging/docker-compose.yml up -d
- rules:
- - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
-deploy-staging-manual-8080-gfz:
- stage: deploy-staging
- environment:
- name: gfzstaging8080
- url: http://${GFZ_STAGING_HOST}:8080
- tags:
- - deploy
- - staging
- - gfz
- - shell
- variables:
- COMPOSE_PROJECT_NAME: ssmfrontend
- before_script:
- - *docker_login_gitlab_registry
- script:
- - docker-compose -f docker/deployment/gfz/staging8080/docker-compose.yml pull
- - docker-compose -f docker/deployment/gfz/staging8080/docker-compose.yml up -d
- dependencies:
- - build-deploy-image-manual-gfz
- when: manual
-
deploy-staging-ufz:
stage: deploy-staging
resource_group: rdm-test
@@ -330,37 +265,3 @@ deploy-staging-ufz:
- mkdir -p ~/.ssh && echo "$SERVER_CD_HOSTKEY" >> ~/.ssh/known_hosts
## fire it up (deployment is triggered by "command" parameter in targets authorized_keys
- ssh root@rdm-test.intranet.ufz.de
-
-test-availability-staging-gfz:
- stage: after-deployment-tests
- image: python:3
- environment:
- name: gfzstaging
- url: http://$GFZ_STAGING_HOST
- tags:
- - deploy
- - staging
- - gfz
- script:
- - curl http://$GFZ_STAGING_HOST
- dependencies:
- - deploy-staging-gfz
- rules:
- - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
-test-availability-staging8080-gfz:
- stage: after-deployment-tests
- image: python:3
- environment:
- name: gfzstaging8080
- url: http://${GFZ_STAGING_HOST}:8080
- tags:
- - deploy
- - staging
- - gfz
- script:
- - curl http://${GFZ_STAGING_HOST}:8080
- dependencies:
- - deploy-staging-manual-8080-gfz
- when: manual
-
diff --git a/docker-compose-gfz-local-with-staging-vm.yml b/docker-compose-gfz-local-with-staging-vm.yml
index 0bbf52bb9e0ed2b1d1dd17347bee7e5f83b089bf..d98d98b10491eaa521b9e3e42ec66579c5439103 100644
--- a/docker-compose-gfz-local-with-staging-vm.yml
+++ b/docker-compose-gfz-local-with-staging-vm.yml
@@ -1,7 +1,8 @@
# Web client of the Sensor Management System software developed within
# the Helmholtz DataHub Initiative by GFZ and UFZ.
#
-# Copyright (C) 2020
+# Copyright (C) 2020-2021
+# - Wilhelm Becker (GFZ, wilhelm.becker@gfz-potsdam.de)
# - Nils Brinckmann (GFZ, nils.brinckmann@gfz-potsdam.de)
# - Marc Hanisch (GFZ, marc.hanisch@gfz-potsdam.de)
# - Helmholtz Centre Potsdam - GFZ German Research Centre for
@@ -41,8 +42,8 @@ services:
- ./gfz-staging-oidc.env
environment:
BASE_URL: "/"
- SMS_BACKEND_URL: "http://rz-vm64.gfz-potsdam.de:5000/rdm/svm-api/v1"
- CV_BACKEND_URL: "http://rz-vm64.gfz-potsdam.de:8000/api/v1"
+ SMS_BACKEND_URL: "http://rz-vm64.gfz-potsdam.de:3001/backend/api/v1"
+ CV_BACKEND_URL: "http://rz-vm64.gfz-potsdam.de:3001/cv/api/v1"
STAY_WITH_HTTP: "true"
INSTITUTE: "gfz"
NUXT_ENV_AUTHORITY: "https://idp-dev.gfz-potsdam.de/cas/oidc/authorize"
diff --git a/docker/deployment/gfz/Dockerfile b/docker/deployment/gfz/Dockerfile
index 275694836e581ae676a491b5eb48c0e387eb293f..fa55873404582071bb0fdbaa05f3abc441aa54c0 100644
--- a/docker/deployment/gfz/Dockerfile
+++ b/docker/deployment/gfz/Dockerfile
@@ -30,55 +30,9 @@
FROM node:16.0.0-buster as js-builder
-# First the urls for sms backend and cv backend
-ARG SMS_BACKEND_URL_ARG
-ENV SMS_BACKEND_URL $SMS_BACKEND_URL_ARG
-
-ARG CV_BACKEND_URL_ARG
-ENV CV_BACKEND_URL $CV_BACKEND_URL_ARG
-
-ENV INSTITUTE gfz
-
-# Then the parameter and endpoints for open id connect
-ARG CLIENT_ID_ARG
-ENV NUXT_ENV_CLIENT_ID $CLIENT_ID_ARG
-
-ARG AUTHORITY_ARG
-ENV NUXT_ENV_AUTHORITY $AUTHORITY_ARG
-
-ARG OIDC_TOKEN_ARG
-ENV NUXT_ENV_OIDC_TOKEN $OIDC_TOKEN_ARG
-
-ARG OIDC_REFRESH_TOKEN_ARG
-ENV NUXT_ENV_OIDC_REFRESH_TOKEN $OIDC_REFRESH_TOKEN_ARG
-
-ARG OIDC_REFRESH_EXPIRE_ARG
-ENV NUXT_ENV_OIDC_REFRESH_EXPIRE $OIDC_REFRESH_EXPIRE_ARG
-
-ARG OIDC_RESPONSE_TYPE_ARG
-ENV NUXT_ENV_OIDC_RESPONSE_TYPE $OIDC_RESPONSE_TYPE_ARG
-
-ARG OIDC_GRANT_TYPE_ARG
-ENV NUXT_ENV_OIDC_GRANT_TYPE $OIDC_GRANT_TYPE_ARG
-
-ARG OIDC_CHALLANGE_ARG
-ENV NUXT_ENV_OIDC_CHALLANGE $OIDC_CHALLANGE_ARG
-
-# And those remaining settings
-# the following is the ufz setting
-#ENV NUXT_ENV_SCOPE openid profile email
-# and this is our setting
-ENV NUXT_ENV_SCOPE profile
-
-# The allowed mime types
-ARG ALLOWED_MIME_TYPES_ARG
-ENV NUXT_ENV_ALLOWED_MIMETYPES $ALLOWED_MIME_TYPES_ARG
-
-RUN mkdir /ssmfrontend
-COPY . /ssmfrontend
-WORKDIR /ssmfrontend
+RUN mkdir /smsfrontend
+COPY . /smsfrontend
+WORKDIR /smsfrontend
RUN npm ci
-RUN npm run build
-FROM nginx:alpine as webserver
-COPY --from=js-builder /ssmfrontend/dist/ /usr/share/nginx/html
+ENTRYPOINT [ "npm", "run", "build" ]
diff --git a/docker/deployment/gfz/staging/default.conf b/docker/deployment/gfz/staging/default.conf
deleted file mode 100644
index 1e1734f7455c6f212d3bbf28621b19fcdb3c76c0..0000000000000000000000000000000000000000
--- a/docker/deployment/gfz/staging/default.conf
+++ /dev/null
@@ -1,75 +0,0 @@
-# Web client of the Sensor Management System software developed within
-# the Helmholtz DataHub Initiative by GFZ and UFZ.
-#
-# Copyright (C) 2020
-# - Nils Brinckmann (GFZ, nils.brinckmann@gfz-potsdam.de)
-# - Marc Hanisch (GFZ, marc.hanisch@gfz-potsdam.de)
-# - Helmholtz Centre Potsdam - GFZ German Research Centre for
-# Geosciences (GFZ, https://www.gfz-potsdam.de)
-#
-# Parts of this program were developed within the context of the
-# following publicly funded projects or measures:
-# - Helmholtz Earth and Environment DataHub
-# (https://www.helmholtz.de/en/research/earth_and_environment/initiatives/#h51095)
-#
-# Licensed under the HEESIL, Version 1.0 or - as soon they will be
-# approved by the "Community" - subsequent versions of the HEESIL
-# (the "Licence").
-#
-# You may not use this work except in compliance with the Licence.
-#
-# You may obtain a copy of the Licence at:
-# https://gitext.gfz-potsdam.de/software/heesil
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Licence is distributed on an "AS IS" basis,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the Licence for the specific language governing
-# permissions and limitations under the Licence.
-
-server {
- listen 80;
- listen [::]:80;
- server_name localhost;
-
- #charset koi8-r;
- #access_log /var/log/nginx/host.access.log main;
- root /usr/share/nginx/html;
-
- location / {
- try_files $uri $uri/ /index.html;
- }
-
- #error_page 404 /404.html;
-
- # redirect server error pages to the static page /50x.html
- #
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root /usr/share/nginx/html;
- }
-
- # proxy the PHP scripts to Apache listening on 127.0.0.1:80
- #
- #location ~ \.php$ {
- # proxy_pass http://127.0.0.1;
- #}
-
- # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
- #
- #location ~ \.php$ {
- # root html;
- # fastcgi_pass 127.0.0.1:9000;
- # fastcgi_index index.php;
- # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
- # include fastcgi_params;
- #}
-
- # deny access to .htaccess files, if Apache's document root
- # concurs with nginx's one
- #
- #location ~ /\.ht {
- # deny all;
- #}
-}
-
diff --git a/docker/deployment/gfz/staging/docker-compose.yml b/docker/deployment/gfz/staging/docker-compose.yml
deleted file mode 100644
index ed5f9c4789af5ba9b8c3c1e5395885876ef66c45..0000000000000000000000000000000000000000
--- a/docker/deployment/gfz/staging/docker-compose.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Web client of the Sensor Management System software developed within
-# the Helmholtz DataHub Initiative by GFZ and UFZ.
-#
-# Copyright (C) 2020
-# - Nils Brinckmann (GFZ, nils.brinckmann@gfz-potsdam.de)
-# - Marc Hanisch (GFZ, marc.hanisch@gfz-potsdam.de)
-# - Helmholtz Centre Potsdam - GFZ German Research Centre for
-# Geosciences (GFZ, https://www.gfz-potsdam.de)
-#
-# Parts of this program were developed within the context of the
-# following publicly funded projects or measures:
-# - Helmholtz Earth and Environment DataHub
-# (https://www.helmholtz.de/en/research/earth_and_environment/initiatives/#h51095)
-#
-# Licensed under the HEESIL, Version 1.0 or - as soon they will be
-# approved by the "Community" - subsequent versions of the HEESIL
-# (the "Licence").
-#
-# You may not use this work except in compliance with the Licence.
-#
-# You may obtain a copy of the Licence at:
-# https://gitext.gfz-potsdam.de/software/heesil
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Licence is distributed on an "AS IS" basis,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the Licence for the specific language governing
-# permissions and limitations under the Licence.
-version : '3'
-
-services:
- ssmfrontend:
- image: ${CI_REGISTRY_IMAGE}:gfz-${CI_COMMIT_TAG:-latest}
- restart: unless-stopped
- #environment:
- ports:
- - 80:80
- volumes:
- - ./default.conf:/etc/nginx/conf.d/default.conf:ro
diff --git a/docker/deployment/gfz/staging8080/default.conf b/docker/deployment/gfz/staging8080/default.conf
deleted file mode 100644
index 57ac3d9a74de4f3082e5f176d72ee476b46679e2..0000000000000000000000000000000000000000
--- a/docker/deployment/gfz/staging8080/default.conf
+++ /dev/null
@@ -1,75 +0,0 @@
-# Web client of the Sensor Management System software developed within
-# the Helmholtz DataHub Initiative by GFZ and UFZ.
-#
-# Copyright (C) 2020
-# - Nils Brinckmann (GFZ, nils.brinckmann@gfz-potsdam.de)
-# - Marc Hanisch (GFZ, marc.hanisch@gfz-potsdam.de)
-# - Helmholtz Centre Potsdam - GFZ German Research Centre for
-# Geosciences (GFZ, https://www.gfz-potsdam.de)
-#
-# Parts of this program were developed within the context of the
-# following publicly funded projects or measures:
-# - Helmholtz Earth and Environment DataHub
-# (https://www.helmholtz.de/en/research/earth_and_environment/initiatives/#h51095)
-#
-# Licensed under the HEESIL, Version 1.0 or - as soon they will be
-# approved by the "Community" - subsequent versions of the HEESIL
-# (the "Licence").
-#
-# You may not use this work except in compliance with the Licence.
-#
-# You may obtain a copy of the Licence at:
-# https://gitext.gfz-potsdam.de/software/heesil
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Licence is distributed on an "AS IS" basis,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the Licence for the specific language governing
-# permissions and limitations under the Licence.
-
-server {
- listen 8080;
- listen [::]:8080;
- server_name localhost;
-
- #charset koi8-r;
- #access_log /var/log/nginx/host.access.log main;
- root /usr/share/nginx/html;
-
- location / {
- try_files $uri $uri/ /index.html;
- }
-
- #error_page 404 /404.html;
-
- # redirect server error pages to the static page /50x.html
- #
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root /usr/share/nginx/html;
- }
-
- # proxy the PHP scripts to Apache listening on 127.0.0.1:80
- #
- #location ~ \.php$ {
- # proxy_pass http://127.0.0.1;
- #}
-
- # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
- #
- #location ~ \.php$ {
- # root html;
- # fastcgi_pass 127.0.0.1:9000;
- # fastcgi_index index.php;
- # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
- # include fastcgi_params;
- #}
-
- # deny access to .htaccess files, if Apache's document root
- # concurs with nginx's one
- #
- #location ~ /\.ht {
- # deny all;
- #}
-}
-
diff --git a/docker/deployment/gfz/staging8080/docker-compose.yml b/docker/deployment/gfz/staging8080/docker-compose.yml
deleted file mode 100644
index df5d6e179be8233f8baac775143b3828d17414cb..0000000000000000000000000000000000000000
--- a/docker/deployment/gfz/staging8080/docker-compose.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Web client of the Sensor Management System software developed within
-# the Helmholtz DataHub Initiative by GFZ and UFZ.
-#
-# Copyright (C) 2020
-# - Nils Brinckmann (GFZ, nils.brinckmann@gfz-potsdam.de)
-# - Marc Hanisch (GFZ, marc.hanisch@gfz-potsdam.de)
-# - Helmholtz Centre Potsdam - GFZ German Research Centre for
-# Geosciences (GFZ, https://www.gfz-potsdam.de)
-#
-# Parts of this program were developed within the context of the
-# following publicly funded projects or measures:
-# - Helmholtz Earth and Environment DataHub
-# (https://www.helmholtz.de/en/research/earth_and_environment/initiatives/#h51095)
-#
-# Licensed under the HEESIL, Version 1.0 or - as soon they will be
-# approved by the "Community" - subsequent versions of the HEESIL
-# (the "Licence").
-#
-# You may not use this work except in compliance with the Licence.
-#
-# You may obtain a copy of the Licence at:
-# https://gitext.gfz-potsdam.de/software/heesil
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Licence is distributed on an "AS IS" basis,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the Licence for the specific language governing
-# permissions and limitations under the Licence.
-version : '3'
-
-services:
- ssmfrontend8080:
- image: ${CI_REGISTRY_IMAGE}:gfz-${CI_COMMIT_SHORT_SHA:-latest}
- restart: unless-stopped
- #environment:
- ports:
- - 8080:8080
- volumes:
- - ./default.conf:/etc/nginx/conf.d/default.conf:ro