Skip to content

Commit

Permalink
fix nginx docker error (#2486)
Browse files Browse the repository at this point in the history
  • Loading branch information
cp-at-mit authored Dec 5, 2024
1 parent e0733c4 commit 8e549c5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion nginx/20-compile-nginx-conf-erb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
3 changes: 1 addition & 2 deletions nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 8e549c5

Please sign in to comment.