From 8e549c599fed97e0784a227c9efd012656edfc20 Mon Sep 17 00:00:00 2001 From: cp-at-mit Date: Thu, 5 Dec 2024 09:22:31 -0500 Subject: [PATCH] fix nginx docker error (#2486) --- nginx/20-compile-nginx-conf-erb.sh | 2 +- nginx/Dockerfile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nginx/20-compile-nginx-conf-erb.sh b/nginx/20-compile-nginx-conf-erb.sh index 20a1c897b5..ba5e84b72d 100755 --- a/nginx/20-compile-nginx-conf-erb.sh +++ b/nginx/20-compile-nginx-conf-erb.sh @@ -9,7 +9,7 @@ auto_erb_build() { template="/etc/nginx/templates/nginx.conf.erb" output_path="/etc/nginx/nginx.conf" - echo >&3 "$ME: Running erb on $template to $output_path" + echo "$ME: Running erb on $template to $output_path" erb "$template" >"$output_path" } diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 51e3fd8756..b74c5a30a4 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -11,8 +11,7 @@ RUN mkdir -p /etc/nginx/logs && ln -sf /var/log/nginx /etc/nginx/logs/ # erb unfortunately needs a whole ruby install RUN apt-get update && apt-get install -y ruby -# this gets run automatically by the nginx container's entrypoint -COPY 20-compile-nginx-conf-erb.sh /docker-entrypoint.d +COPY --chmod=777 20-compile-nginx-conf-erb.sh /docker-entrypoint.d # NOTE: this removes the args "-g daemon off" because nginx is impolite # and treats a cli flag and a config flag as duplicate: