From 36610b6acf989b7621bb8cebb6d74373eaa2d508 Mon Sep 17 00:00:00 2001 From: takatost Date: Sun, 30 Jun 2024 20:18:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20can=E2=80=99t=20change=20exec=20permissi?= =?UTF-8?q?ons=20after=20mounting=20`docker-entrypoint.sh`=20for=20nginx?= =?UTF-8?q?=20and=20ssrf-proxy=20services=20causing=20startup=20failures?= =?UTF-8?q?=20(#5776)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 0fbd8e24df..43deb89c6e 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -362,8 +362,8 @@ services: restart: always volumes: - ./ssrf_proxy/squid.conf.template:/etc/squid/squid.conf.template - - ./ssrf_proxy/docker-entrypoint.sh:/docker-entrypoint.sh - entrypoint: ["sh", "-c", "chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh"] + - ./ssrf_proxy/docker-entrypoint.sh:/docker-entrypoint-mount.sh + entrypoint: [ "sh", "-c", "cp /docker-entrypoint-mount.sh /docker-entrypoint.sh && sed -i 's/\r$//' /docker-entrypoint.sh && chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh" ] environment: # pls clearly modify the squid env vars to fit your network environment. HTTP_PORT: ${SSRF_HTTP_PORT:-3128} @@ -384,9 +384,9 @@ services: - ./nginx/nginx.conf.template:/etc/nginx/nginx.conf.template - ./nginx/proxy.conf.template:/etc/nginx/proxy.conf.template - ./nginx/conf.d:/etc/nginx/conf.d - - ./nginx/docker-entrypoint.sh:/docker-entrypoint.sh + - ./nginx/docker-entrypoint.sh:/docker-entrypoint-mount.sh - ./nginx/ssl:/etc/ssl - entrypoint: ["sh", "-c", "chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh"] + entrypoint: [ "sh", "-c", "cp /docker-entrypoint-mount.sh /docker-entrypoint.sh && sed -i 's/\r$//' /docker-entrypoint.sh && chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh" ] environment: NGINX_SERVER_NAME: ${NGINX_SERVER_NAME:-_} HTTPS_ENABLED: ${HTTPS_ENABLED:-false}