From 78ee0fcedccfacb6adae13eca8613dd50cf4297e Mon Sep 17 00:00:00 2001 From: Sergej Hoffmann <97111299+SevenWaysDP@users.noreply.github.com> Date: Thu, 8 Feb 2024 18:59:16 +0100 Subject: [PATCH] BC-3638 - add env EXIT_ON_ERROR (#66) --- compose-files/docker-compose.yml | 3 + docker-compose.end-to-end-tests-Build.yml | 162 ---------------------- docker-compose.integration-test-Build.yml | 141 ------------------- 3 files changed, 3 insertions(+), 303 deletions(-) delete mode 100644 docker-compose.end-to-end-tests-Build.yml delete mode 100644 docker-compose.integration-test-Build.yml diff --git a/compose-files/docker-compose.yml b/compose-files/docker-compose.yml index 728445c..5622bd2 100644 --- a/compose-files/docker-compose.yml +++ b/compose-files/docker-compose.yml @@ -129,6 +129,7 @@ services: - calendar environment: # ENV + - EXIT_ON_ERROR=false - NODE_ENV=${NODE_ENV:-development} - HOST=http://localhost:3030 - SC_DOMAIN=localhost @@ -142,6 +143,8 @@ services: - FILES_STORAGE__S3_SECRET_ACCESS_KEY=miniouser - FILES_STORAGE__S3_BUCKET=schulcloud - FILES_STORAGE__S3_REGION=eu-central-1 + - CLAMAV__SERVICE_HOSTNAME=localhost + - CLAMAV__SERVICE_PORT=3310 # URIs and Port - DB_URL=mongodb://mongodb:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false&readPreference=secondary - DATABASE__URL=mongodb://server-mongodb:27017/schulcloud diff --git a/docker-compose.end-to-end-tests-Build.yml b/docker-compose.end-to-end-tests-Build.yml deleted file mode 100644 index 02ed9ce..0000000 --- a/docker-compose.end-to-end-tests-Build.yml +++ /dev/null @@ -1,162 +0,0 @@ -version: "3" - - -############################################################################## -# THIS FILE SHOULD GET DELETED WHEN THE FOLLOWING PRs ARE MERGED -# https://github.com/hpi-schul-cloud/nuxt-client/pull/314 -# https://github.com/hpi-schul-cloud/schulcloud-client/pull/1457 -# https://github.com/hpi-schul-cloud/end-to-end-tests/pull/31 -############################################################################## -services: - ### Schul-Cloud Server - ### - server-mongodb: - image: mongo:4.2 - ports: - - "27017:27017" - volumes: - - data-server-mongodb:/data/db - restart: unless-stopped - - rabbitmq: - image: rabbitmq:3.8.9-management - ports: - - 5672:5672 - restart: unless-stopped - - server: - build: - context: ../schulcloud-server - dockerfile: Dockerfile - depends_on: - - server-mongodb - - rabbitmq - environment: - # ENV - - NODE_ENV=production - - HOST=http://localhost:3030 - - SC_DOMAIN=localhost - - SC_TITLE=HPI Schulcloud - - SC_SHORT_TITLE=Schulcloud - # SMTP - # - SMTP= - # - SMTP_SENDER= - # Storage - - AWS_ENDPOINT_URL=https://dev-storage.schul-cloud.org:9001 - # - AWS_ENDPOINT_URL=http://localhost:9000 - ## keys for local s3 storage - # - AWS_ACCESS_KEY= - # - AWS_SECRET_ACCESS_KEY= - - S3_KEY= - # URIs and Port - - MONGO_URI=mongodb://server-mongodb:27017/schulcloud - - DB_URL=mongodb://server-mongodb:27017/schulcloud - - DATABASE__URL=mongodb://server-mongodb:27017/schulcloud - - RABBITMQ_URI=amqp://guest:guest@rabbitmq:5672 - - PORT=3030 - - CONTENT_URI=https://content.schul-cloud.org - # RocketChat - - ROCKET_CHAT_URI=https://chat.schulcloud.local - # - ROCKET_CHAT_ADMIN_TOKEN= - # - ROCKET_CHAT_ADMIN_TOKEN= - # - ROCKET_CHAT_ADMIN_ID= - # AUTH Secret - - AES_KEY=fortestingonly12 - # - AUTHENTICATION= - - IGNORE_DISCOVERABILITY=true - # BRUTE FORCE PROTECTION - - LOGIN_BLOCK_TIME=3 - # FEATURE TOGGLES - - LERNSTORE_MODE=LEGACY - # ENV new file service - please not no minio is deployed but env must be set, they are required - - FILES_STORAGE__INCOMING_REQUEST_TIMEOUT=6000000 - - FILES_STORAGE__SERVICE_BASE_URL=http://localhost:4444 - - FILES_STORAGE__S3_ENDPOINT=http://localhost:9000 - - FILES_STORAGE__S3_ACCESS_KEY_ID=miniouser - - FILES_STORAGE__S3_SECRET_ACCESS_KEY=miniouser - - FILES_STORAGE__S3_BUCKET=schulcloud - - FILES_STORAGE__S3_REGION=eu-central-1 - - CLAMAV__SERVICE_HOSTNAME=localhost - - CLAMAV__SERVICE_PORT=3310 - - PUBLIC_BACKEND_URL=http://server:3030/api - # fwu learning contents - - FWU_CONTENT__S3_ENDPOINT=http://localhost:4568 - - FWU_CONTENT__S3_ACCESS_KEY=S3RVER - - FWU_CONTENT__S3_SECRET_KEY=S3RVER - - FWU_CONTENT__S3_BUCKET=fwu-content - - FWU_CONTENT__S3_REGION=eu-central-1 - - ports: - - "3030:3030" - - "5959:5959" - restart: unless-stopped - command: npm run start - ### - - ### Schul-Cloud Client - ### - client: - build: - context: ../schulcloud-client - dockerfile: Dockerfile - depends_on: - - server - environment: - # ENV - - NODE_ENV=development - - DOCKER=true - - CALENDAR_SERVICE_ENABLED=true - #- TZ=Europe/Berlin - # Theme and Titles - - SC_TITLE=HPI Schulcloud - - SC_SHORT_TITLE=Schulcloud - - SC_PRODUCTNAME=Hauptschule - - SC_FEDERALSTATE=mainstate - # Google - #- GOOGLE_ANALYTICS_TRACKING_ID="UA-155982548-1" - # URIs - - HOST=http://localhost:3100 - - API_HOST=http://server:3030/api - - PUBLIC_BACKEND_URL=http://server:3030 - # - LIBRE_OFFICE_CLIENT_URL=http://localhost:9980 - # - ROCKET_CHAT_URI=https://chat.schulcloud.local - # FEATURE TOGGLES - - FEATURE_TEAMS_ENABLED=true - - FEATURE_EXTENSIONS_ENABLED=true - - LERNSTORE_MODE=LEGACY - # - ROCKETCHAT_SERVICE_ENABLED=true - # - EDTR_SOURCE=https://cdn.jsdelivr.net/gh/schul-cloud/edtrio@e9d3bb9d66092bafa07846269c8fc6f9d5fb0559/dist/index.js - # BRUTE FORCE PROTECTION - - LOGIN_BLOCK_TIME=3 - ports: - - "3100:3100" - restart: unless-stopped - command: npm run start - - # Selenium Server - selenium-hub: - image: selenium/hub:3.141.59-titanium - container_name: selenium-hub - ports: - - "4444:4444" - chrome: - image: selenium/node-chrome:3.141.59-titanium - volumes: - - /dev/shm:/dev/shm - depends_on: - - selenium-hub - environment: - - HUB_HOST=selenium-hub - - HUB_PORT=4444 -# firefox: -# image: selenium/node-firefox:3.141.59-titanium -# volumes: -# - /dev/shm:/dev/shm -# depends_on: -# - selenium-hub -# environment: -# - HUB_HOST=selenium-hub -# - HUB_PORT=4444 - -volumes: - data-server-mongodb: diff --git a/docker-compose.integration-test-Build.yml b/docker-compose.integration-test-Build.yml deleted file mode 100644 index f7bf5f9..0000000 --- a/docker-compose.integration-test-Build.yml +++ /dev/null @@ -1,141 +0,0 @@ -version: "3" - - -############################################################################## -# THIS FILE SHOULD GET DELETED WHEN THE FOLLOWING PRs ARE MERGED -# https://github.com/hpi-schul-cloud/nuxt-client/pull/314 -# https://github.com/hpi-schul-cloud/schulcloud-client/pull/1457 -# https://github.com/hpi-schul-cloud/end-to-end-tests/pull/31 -############################################################################## -services: - ### Schul-Cloud Server - ### - server-mongodb: - image: mongo:4.2 - ports: - - "27017:27017" - volumes: - - data-server-mongodb:/data/db - restart: unless-stopped - - server: - build: - context: ../schulcloud-server - dockerfile: Dockerfile - depends_on: - - server-mongodb - environment: - # ENV - - NODE_ENV=production - - HOST=http://localhost:3030 - - SC_DOMAIN=localhost - - SC_TITLE=HPI Schulcloud - - SC_SHORT_TITLE=Schulcloud - # SMTP - # - SMTP= - # - SMTP_SENDER= - # Storage - - AWS_ENDPOINT_URL=https://dev-storage.schul-cloud.org:9001 - # - AWS_ENDPOINT_URL=http://localhost:9000 - ## keys for local s3 storage - # - AWS_ACCESS_KEY= - # - AWS_SECRET_ACCESS_KEY= - # URIs and Port - - MONGO_URI=mongodb://server-mongodb:27017/schulcloud - - DB_URL=mongodb://server-mongodb:27017/schulcloud - - DATABASE__URL=mongodb://server-mongodb:27017/schulcloud - - PORT=3030 - - CONTENT_URI=https://content.schul-cloud.org - # RocketChat - - ROCKET_CHAT_URI=https://chat.schulcloud.local - # - ROCKET_CHAT_ADMIN_TOKEN= - # - ROCKET_CHAT_ADMIN_TOKEN= - # - ROCKET_CHAT_ADMIN_ID= - # AUTH Secret - # - AUTHENTICATION= - - IGNORE_DISCOVERABILITY=true - # BRUTE FORCE PROTECTION - - LOGIN_BLOCK_TIME=3 - # FEATURE TOGGLES - - LERNSTORE_MODE=LEGACY - - PUBLIC_BACKEND_URL=http://server:3030/api - # fwu learning contents - - FWU_CONTENT__S3_ENDPOINT=http://localhost:4568 - - FWU_CONTENT__S3_ACCESS_KEY=S3RVER - - FWU_CONTENT__S3_SECRET_KEY=S3RVER - - FWU_CONTENT__S3_BUCKET=fwu-content - - FWU_CONTENT__S3_REGION=eu-central-1 - ports: - - "3030:3030" - - "5959:5959" - restart: unless-stopped - command: npm run start - ### - - ### Schul-Cloud Client - ### - client: - build: - context: ../schulcloud-client - dockerfile: Dockerfile - depends_on: - - server - environment: - # ENV - - NODE_ENV=development - - DOCKER=true - - CALENDAR_SERVICE_ENABLED=true - #- TZ=Europe/Berlin - # Theme and Titles - - SC_TITLE=HPI Schulcloud - - SC_SHORT_TITLE=Schulcloud - - SC_PRODUCTNAME=Hauptschule - - SC_FEDERALSTATE=mainstate - # Google - #- GOOGLE_ANALYTICS_TRACKING_ID="UA-155982548-1" - # URIs - - HOST=http://localhost:3100 - - API_HOST=http://server:3030/api - - PUBLIC_BACKEND_URL=http://server:3030/api - # - LIBRE_OFFICE_CLIENT_URL=http://localhost:9980 - # - ROCKET_CHAT_URI=https://chat.schulcloud.local - # FEATURE TOGGLES - - FEATURE_TEAMS_ENABLED=true - - FEATURE_EXTENSIONS_ENABLED=true - - LERNSTORE_MODE=LEGACY - # - ROCKETCHAT_SERVICE_ENABLED=true - # - EDTR_SOURCE=https://cdn.jsdelivr.net/gh/schul-cloud/edtrio@e9d3bb9d66092bafa07846269c8fc6f9d5fb0559/dist/index.js - # BRUTE FORCE PROTECTION - - LOGIN_BLOCK_TIME=3 - ports: - - "3100:3100" - restart: unless-stopped - command: npm run start - - # Selenium Server - selenium-hub: - image: selenium/hub:3.141.59-titanium - container_name: selenium-hub - ports: - - "4444:4444" - chrome: - image: selenium/node-chrome:3.141.59-titanium - volumes: - - /dev/shm:/dev/shm - depends_on: - - selenium-hub - environment: - - HUB_HOST=selenium-hub - - HUB_PORT=4444 -# firefox: -# image: selenium/node-firefox:3.141.59-titanium -# volumes: -# - /dev/shm:/dev/shm -# depends_on: -# - selenium-hub -# environment: -# - HUB_HOST=selenium-hub -# - HUB_PORT=4444 - -volumes: - data-server-mongodb: