From 23e6eaf212f6b601e9a577e000c8c718dd272778 Mon Sep 17 00:00:00 2001 From: Marco Kundt Date: Tue, 11 May 2021 17:39:34 +0200 Subject: [PATCH] Revert "hardening options" This reverts commit e8867805feb7d9568b68743dd7af48cb7988e483. --- docker-compose.nginx.yml | 8 +------- docker-compose.yml | 14 +------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/docker-compose.nginx.yml b/docker-compose.nginx.yml index 8f695dd..27340fe 100644 --- a/docker-compose.nginx.yml +++ b/docker-compose.nginx.yml @@ -1,4 +1,4 @@ -version: "2.4" +version: "3" services: nginx: @@ -6,13 +6,7 @@ services: - mattermost container_name: nginx_mattermost image: nginx:${NGINX_IMAGE_TAG} - pids_limit: 10 restart: ${RESTART_POLICY} - read_only: true - tmpfs: - - /var/run - - /var/cache - - /var/log/nginx volumes: - ${NGINX_CONFIG_PATH}:/etc/nginx/conf.d:ro - ${NGINX_DHPARAMS_FILE}:/dhparams4096.pem diff --git a/docker-compose.yml b/docker-compose.yml index c273fac..0f742f4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,17 +1,12 @@ # https://docs.docker.com/compose/environment-variables/ -version: "2.4" +version: "3" services: postgres: container_name: postgres_mattermost image: postgres:${POSTGRES_IMAGE_TAG} - pids_limit: 10 restart: ${RESTART_POLICY} - read_only: true - tmpfs: - - /tmp - - /var/run/postgresql volumes: - ${POSTGRES_DATA_PATH}:/var/lib/postgresql/data environment: @@ -28,11 +23,7 @@ services: - postgres container_name: mattermost image: mattermost/${MATTERMOST_IMAGE}:${MATTERMOST_IMAGE_TAG} - pids_limit: 15 restart: ${RESTART_POLICY} - read_only: true - tmpfs: - - /tmp volumes: - ${MATTERMOST_CONFIG_PATH}:/mattermost/config:rw - ${MATTERMOST_DATA_PATH}:/mattermost/data:rw @@ -58,8 +49,5 @@ services: # container_name: watchtower # image: containrrr/watchtower:latest # restart: unless-stopped -# read_only: true -# tmpfs: -# - /tmp # volumes: # - /var/run/docker.sock:/var/run/docker.sock