From 3600dc82061658efbf8f0a120a2c0da5336542f2 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Mon, 24 Apr 2023 13:15:16 +0200 Subject: [PATCH 1/4] added installation of custom ca-certificates --- .env.example | 1 - docker-compose.yml | 54 ++++++++++++++++++++++++++++++ workspace/Dockerfile | 9 +++++ workspace/ca-certificates/.gitkeep | 0 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 workspace/ca-certificates/.gitkeep diff --git a/.env.example b/.env.example index 0fc203ec..b2f39fae 100644 --- a/.env.example +++ b/.env.example @@ -215,7 +215,6 @@ WORKSPACE_INSTALL_EVENT=false WORKSPACE_INSTALL_DNSUTILS=true WORKSPACE_XDEBUG_PORT=9000 WORKSPACE_VITE_PORT=5173 - ### PHP_FPM ############################################### PHP_FPM_BASE_IMAGE_TAG_PREFIX=latest diff --git a/docker-compose.yml b/docker-compose.yml index 19f1518b..ddd4f44c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2100,3 +2100,57 @@ services: - frontend - backend restart: always + +### Sentry #################################### + + sentry: + image: sentry:latest + depends_on: + - redis + - postgres + links: + - redis + - postgres + ports: + - ${SENTRY_PORT}:9000 + environment: + - SENTRY_SECRET_KEY=${SENTRY_SECRET_KEY} + - SENTRY_REDIS_HOST=redis + - SENTRY_POSTGRES_HOST=postgres + - SENTRY_DB_USER=${POSTGRES_USER} + - SENTRY_DB_PASSWORD=${POSTGRES_PASSWORD} + networks: + - backend + - frontend + + sentry_celery_beat: + image: sentry:latest + depends_on: + - redis + - postgres + command: "sentry run cron" + environment: + - SENTRY_SECRET_KEY=${SENTRY_SECRET_KEY} + - SENTRY_REDIS_HOST=redis + - SENTRY_POSTGRES_HOST=postgres + - SENTRY_DB_USER=${POSTGRES_USER} + - SENTRY_DB_PASSWORD=${POSTGRES_PASSWORD} + networks: + - backend + - frontend + + sentry_celery_worker: + image: sentry:latest + depends_on: + - redis + - postgres + command: "sentry run worker" + environment: + - SENTRY_SECRET_KEY=${SENTRY_SECRET_KEY} + - SENTRY_REDIS_HOST=redis + - SENTRY_POSTGRES_HOST=postgres + - SENTRY_DB_USER=${POSTGRES_USER} + - SENTRY_DB_PASSWORD=${POSTGRES_PASSWORD} + networks: + - backend + - frontend \ No newline at end of file diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 0eb9ff27..eec0add7 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -198,6 +198,15 @@ COPY ./crontab /etc/cron.d RUN chmod -R 644 /etc/cron.d +########################################################################### +# Certificate Authorities +########################################################################### + +USER root + +COPY ./ca-certificates/* /usr/local/share/ca-certificates/ +RUN update-ca-certificates + ########################################################################### # Drush: ########################################################################### diff --git a/workspace/ca-certificates/.gitkeep b/workspace/ca-certificates/.gitkeep new file mode 100644 index 00000000..e69de29b From f831a05d05831f9821ee33b7eda19b49c9d51bca Mon Sep 17 00:00:00 2001 From: Max Weber Date: Mon, 24 Apr 2023 13:24:08 +0200 Subject: [PATCH 2/4] updated dokumentation --- DOCUMENTATION/content/documentation/index.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index 14b4d5ad..bdee05ad 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -2525,6 +2525,13 @@ docker-compose up ... *Note: If you faced any errors, try restarting Docker, and make sure you have no spaces in the `d4m-nfs-mounts.txt` file, and your `/etc/exports` file is clear.* +
+ +## ca-certificates + +To install your own CA certificates, you can add them to the `workspace/ca-certificates` folder. +This way the certificates will be installed into the system ca store of the workspace container. +
From 680a560628a631b006dcfe32e18ac33a1fcbecab Mon Sep 17 00:00:00 2001 From: DrDynamic Date: Mon, 24 Apr 2023 16:35:14 +0200 Subject: [PATCH 3/4] removed sentry from docker-compose --- docker-compose.yml | 54 ---------------------------------------------- 1 file changed, 54 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ddd4f44c..19f1518b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2100,57 +2100,3 @@ services: - frontend - backend restart: always - -### Sentry #################################### - - sentry: - image: sentry:latest - depends_on: - - redis - - postgres - links: - - redis - - postgres - ports: - - ${SENTRY_PORT}:9000 - environment: - - SENTRY_SECRET_KEY=${SENTRY_SECRET_KEY} - - SENTRY_REDIS_HOST=redis - - SENTRY_POSTGRES_HOST=postgres - - SENTRY_DB_USER=${POSTGRES_USER} - - SENTRY_DB_PASSWORD=${POSTGRES_PASSWORD} - networks: - - backend - - frontend - - sentry_celery_beat: - image: sentry:latest - depends_on: - - redis - - postgres - command: "sentry run cron" - environment: - - SENTRY_SECRET_KEY=${SENTRY_SECRET_KEY} - - SENTRY_REDIS_HOST=redis - - SENTRY_POSTGRES_HOST=postgres - - SENTRY_DB_USER=${POSTGRES_USER} - - SENTRY_DB_PASSWORD=${POSTGRES_PASSWORD} - networks: - - backend - - frontend - - sentry_celery_worker: - image: sentry:latest - depends_on: - - redis - - postgres - command: "sentry run worker" - environment: - - SENTRY_SECRET_KEY=${SENTRY_SECRET_KEY} - - SENTRY_REDIS_HOST=redis - - SENTRY_POSTGRES_HOST=postgres - - SENTRY_DB_USER=${POSTGRES_USER} - - SENTRY_DB_PASSWORD=${POSTGRES_PASSWORD} - networks: - - backend - - frontend \ No newline at end of file From e36150e11103b8172b74317e2c00afc48bbfdb16 Mon Sep 17 00:00:00 2001 From: DrDynamic Date: Mon, 24 Apr 2023 16:40:07 +0200 Subject: [PATCH 4/4] ceaned up .env.example --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index b2f39fae..0fc203ec 100644 --- a/.env.example +++ b/.env.example @@ -215,6 +215,7 @@ WORKSPACE_INSTALL_EVENT=false WORKSPACE_INSTALL_DNSUTILS=true WORKSPACE_XDEBUG_PORT=9000 WORKSPACE_VITE_PORT=5173 + ### PHP_FPM ############################################### PHP_FPM_BASE_IMAGE_TAG_PREFIX=latest