From fc2fccbd5b1b200583d5c1733e7b5aee2ce4bf06 Mon Sep 17 00:00:00 2001 From: Tobias Wackenhut Date: Thu, 23 Dec 2021 12:41:18 +0100 Subject: [PATCH 1/3] Update to solr 8.11. This change has already happened in production --- docker/development/docker-compose.yml | 2 +- docker/production/docker-compose.production.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml index 4793279bd..e62301b03 100644 --- a/docker/development/docker-compose.yml +++ b/docker/development/docker-compose.yml @@ -5,7 +5,7 @@ services: image: "redis:alpine" solr: - image: "solr:8" + image: "solr:8.11" ports: - "127.0.0.1:8983:8983" volumes: diff --git a/docker/production/docker-compose.production.yml b/docker/production/docker-compose.production.yml index 5ee428676..66132ede6 100644 --- a/docker/production/docker-compose.production.yml +++ b/docker/production/docker-compose.production.yml @@ -63,7 +63,7 @@ services: - default solr: - image: solr:8.1 + image: solr:8.11 container_name: solr ports: - "127.0.0.1:8983:8983" From f0c7c36ca1c94f6e741b1ef5fe16b3228623a983 Mon Sep 17 00:00:00 2001 From: Tobias Wackenhut Date: Thu, 23 Dec 2021 13:05:04 +0100 Subject: [PATCH 2/3] Add new IMAP environment variables --- docker/development/docker-compose.yml | 4 ++++ docker/production/docker.env | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml index e62301b03..53dbcce95 100644 --- a/docker/development/docker-compose.yml +++ b/docker/development/docker-compose.yml @@ -79,6 +79,10 @@ services: WEBPACKER_DEV_SERVER_HOST: webpacker MAMPF_REGISTRATION_TIMEFRAME: 25 MAMPF_MAX_REGISTRATION_PER_TIMEFRAME: 40 + IMAPSERVER: localhost + PROJECT_EMAIL_USERNAME: mampf + PROJECT_EMAIL_PASSWORD: mampf + PROJECT_EMAIL_MAILBOX: mampf # uncomment DB_SQL_PRESEED_URL and UPLOADS_PRESEED_URL to enable db preseeding # DB_SQL_PRESEED_URL: "https://heibox.uni-heidelberg.de/d/6fb4a9d2e7f54d8b9931/files/?p=%2F20201128165713_mampf.sql&dl=1" # UPLOADS_PRESEED_URL: "https://heibox.uni-heidelberg.de/f/d2f72a4069814debaf69/?dl=1" diff --git a/docker/production/docker.env b/docker/production/docker.env index 12c214d28..8070eb0d9 100644 --- a/docker/production/docker.env +++ b/docker/production/docker.env @@ -16,6 +16,10 @@ MAILSERVER=mail.mathi.uni-heidelberg.de PROJECT_EMAIL=mampf@mathi.uni-heidelberg.de ERROR_EMAIL=mampf-error@mathi.uni-heidelberg.de MAILID_DOMAIN=mathi.uni-heidelberg.de +IMAPSERVER=mail.mathi.uni-heidelberg.de +PROJECT_EMAIL_USERNAME=creativeusername +PROJECT_EMAIL_PASSWORD=secretsecret +PROJECT_EMAIL_MAILBOX=Other Users/mampf # Due to CORS constraints, some urls are proxied to the media server DOWNLOAD_LOCATION=https://mampf.mathi.uni-heidelberg.de/mediaforward From 3382262aee569606717a5a17a6ad45e2446cea72 Mon Sep 17 00:00:00 2001 From: Tobias Wackenhut Date: Thu, 23 Dec 2021 13:37:38 +0100 Subject: [PATCH 3/3] Add IMAP server to development docker-compose file --- docker/development/docker-compose.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml index 53dbcce95..1850c0c32 100644 --- a/docker/development/docker-compose.yml +++ b/docker/development/docker-compose.yml @@ -38,6 +38,17 @@ services: ports: - "127.0.0.1:1080:1080" + imap: + image: antespi/docker-imap-devel:latest + ports: + - "1025:25" + - "10143:143" + - "10993:993" + environment: + - MAILNAME=localhost + - MAIL_ADDRESS=mampf@localhost + - MAIL_PASS=mampf + mampf: build: context: ./../.. @@ -79,10 +90,11 @@ services: WEBPACKER_DEV_SERVER_HOST: webpacker MAMPF_REGISTRATION_TIMEFRAME: 25 MAMPF_MAX_REGISTRATION_PER_TIMEFRAME: 40 - IMAPSERVER: localhost + IMAPSERVER: imap:10993 + IMAP_TLS_IGNORE_CERT: 1 PROJECT_EMAIL_USERNAME: mampf PROJECT_EMAIL_PASSWORD: mampf - PROJECT_EMAIL_MAILBOX: mampf + PROJECT_EMAIL_MAILBOX: INBOX # uncomment DB_SQL_PRESEED_URL and UPLOADS_PRESEED_URL to enable db preseeding # DB_SQL_PRESEED_URL: "https://heibox.uni-heidelberg.de/d/6fb4a9d2e7f54d8b9931/files/?p=%2F20201128165713_mampf.sql&dl=1" # UPLOADS_PRESEED_URL: "https://heibox.uni-heidelberg.de/f/d2f72a4069814debaf69/?dl=1"