Commit 1f33e50e authored by Julian Gründner's avatar Julian Gründner

yaml lint

parent e7ef4912
Pipeline #5493 failed
......@@ -28,7 +28,7 @@ lint yaml:
- "deploy/*"
except:
- tags
get next version:
image: docker.miracum.org/miracum-devops/semantic-release
stage: version
......@@ -52,7 +52,7 @@ createInstallPackages:
paths:
- ./deploy/*.tgz
- .VERSION
expire_in: 1 day
expire_in: 1 day
except:
- tags
......@@ -60,7 +60,7 @@ deployInstallPackages:
stage: deploy
dependencies:
- createInstallPackages
script:
script:
- export VERSION=$(cat .VERSION)
- sh -c "cd deploy && ./deploy_install_packages.sh v$VERSION"
except:
......@@ -73,6 +73,3 @@ create project release:
- npx semantic-release
only:
- master
......@@ -11,18 +11,18 @@ services:
- /etc/dsqp/auth/:/etc/nginx/conf.d
- /etc/dsqp/auth/nginx.conf:/etc/nginx/nginx.conf:ro
networks:
- rstudio
- rstudio
rstudio:
container_name: ds_rstudio
restart: unless-stopped
image: docker.miracum.org/datashield_miracum/ds_analysis:v0.8.0
environment:
- RSTUDIO_USERS=${RSTUDIO_USERS}
- RSTUDIO_USERS=${RSTUDIO_USERS}
volumes:
- ${QP_DATA_DIR}/ds_homes/:/home/
networks:
- rstudio
command: bash -c "/startRServer.sh"
- rstudio
command: bash -c "/startRServer.sh"
networks:
rstudio:
......@@ -6,45 +6,45 @@ services:
restart: unless-stopped
image: docker.miracum.org/datashield_miracum/ds_opal:v0.8.0
ports:
- "443:8443"
- "443:8443"
networks:
- opal_net
- opal_net
environment:
- OPAL_ADMINISTRATOR_PASSWORD=${OPAL_ADMIN_PASS}
- RSERVER_PORT_6312_TCP_ADDR=${R_SERVER_HOST}
- MONGODBHOST=${OPAL_MONGODB_HOST}
- INITTESTDATA=true
- OPAL_ADMINISTRATOR_PASSWORD=${OPAL_ADMIN_PASS}
- RSERVER_PORT_6312_TCP_ADDR=${R_SERVER_HOST}
- MONGODBHOST=${OPAL_MONGODB_HOST}
- INITTESTDATA=true
volumes:
- ${QP_DATA_DIR}/opal:/srv
- /etc/dsqp/auth:/auth
- /etc/dsqp/miracum_users:/miracum_users
- ${QP_DATA_DIR}/opal:/srv
- /etc/dsqp/auth:/auth
- /etc/dsqp/miracum_users:/miracum_users
rserver:
container_name: datashield_rserver
restart: unless-stopped
image: obiba/opal-rserver:latest
networks:
- opal_net
- opal_net
mongo:
container_name: datashield_mongo
restart: unless-stopped
image: mongo:4
volumes:
- ${QP_DATA_DIR}/mongo_data:/data/db
- ${QP_DATA_DIR}/mongo_data:/data/db
networks:
- opal_net
- opal_net
poll_server:
container_name: poll_server
restart: unless-stopped
image: docker.miracum.org/datashield_miracum/ds_poll:v0.9.1
environment:
- POLL_QUEUE_SERVER=${POLL_QUEUE_SERVER}
- POLL_OPAL_SERVER=${POLL_OPAL_SERVER}
- POLL_THREADS=${POLL_THREADS}
- CHECK_SERVER_CERT=${CHECK_SERVER_CERT}
- LOG_LEVEL=${LOG_LEVEL}
- POLL_QUEUE_SERVER=${POLL_QUEUE_SERVER}
- POLL_OPAL_SERVER=${POLL_OPAL_SERVER}
- POLL_THREADS=${POLL_THREADS}
- CHECK_SERVER_CERT=${CHECK_SERVER_CERT}
- LOG_LEVEL=${LOG_LEVEL}
networks:
- opal_net
volumes:
......
......@@ -25,9 +25,9 @@ services:
- ${QP_DATA_DIR}/queue_logging:/home/dsqueue/ds_queue/logging
- /etc/dsqp/auth/queue.pem:/root/ds_queue/cert/do_cert/queue.pem
environment:
- TIMEOUT_QUEUE_AND_POLL=${TIMEOUT_QUEUE_AND_POLL} # define timeout for requests
- ALLOWED_IPS=${ALLOWED_IPS}
- LOG_LEVEL=${LOG_LEVEL} # define log level
- TIMEOUT_QUEUE_AND_POLL=${TIMEOUT_QUEUE_AND_POLL}
- ALLOWED_IPS=${ALLOWED_IPS}
- LOG_LEVEL=${LOG_LEVEL}
networks:
- queue_net
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment