Making the nginx root configuration also configurable. (#694)
This is required for enabling custom logging. In future, we can leverage this for proxy caching as well. Not adding this nginx-root.conf.template file to the installation script because there's nothing for the user to configure there during installation. This file will be baked into the Dockerfile and only the environment variables will be replaced during container start.
This commit is contained in:
Arpit Mohan
GitHub
parent
ede03ba554
commit
9d2b017bf3
1
app/client/.gitignore
vendored
1
app/client/.gitignore
vendored
|
|
@ -34,6 +34,7 @@ results/
|
|||
|
||||
/docker/*.pem
|
||||
/docker/nginx.conf
|
||||
/docker/nginx-root.conf
|
||||
|
||||
storybook-static/*
|
||||
build-storybook.log
|
||||
|
|
|
|||
|
|
@ -6,5 +6,7 @@ EXPOSE 80
|
|||
# This is the default nginx template file inside the container.
|
||||
# This is replaced by the install.sh script during a deployment
|
||||
COPY ./docker/templates/nginx-linux.conf.template /nginx.conf.template
|
||||
COPY ./docker/templates/nginx-root.conf.template /nginx-root.conf.template
|
||||
# This is the script that is used to start Nginx when the Docker container starts
|
||||
COPY ./docker/start-nginx.sh /start-nginx.sh
|
||||
CMD ["/start-nginx.sh"]
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ serve -s build -p 3000 &
|
|||
# Substitute all the env variables in nginx
|
||||
vars_to_substitute=$(printf '\$%s,' $(env | grep -o "^APPSMITH_[A-Z0-9_]\+" | xargs))
|
||||
cat ./docker/templates/nginx-linux.conf.template | envsubst ${vars_to_substitute} | sed -e 's|\${\(APPSMITH_[A-Z0-9_]*\)}||g' > ./docker/nginx.conf
|
||||
cat ./docker/templates/nginx-root.conf.template | envsubst ${vars_to_substitute} | sed -e 's|\${\(APPSMITH_[A-Z0-9_]*\)}||g' > ./docker/nginx-root.conf
|
||||
|
||||
# Create the SSL files for Nginx. Required for service workers to work properly.
|
||||
touch ./docker/dev.appsmith.com.pem ./docker/dev.appsmith.com-key.pem
|
||||
|
|
@ -21,6 +22,7 @@ echo "Going to run the nginx server"
|
|||
sudo docker pull nginx:latest
|
||||
|
||||
sudo docker run --network host --name wildcard-nginx -d -p 80:80 -p 443:443 \
|
||||
-v `pwd`/docker/nginx-root.conf:/etc/nginx/nginx.conf \
|
||||
-v `pwd`/docker/nginx.conf:/etc/nginx/conf.d/app.conf \
|
||||
-v `pwd`/docker/dev.appsmith.com.pem:/etc/certificate/dev.appsmith.com.pem \
|
||||
-v `pwd`/docker/dev.appsmith.com-key.pem:/etc/certificate/dev.appsmith.com-key.pem \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
#!/bin/sh
|
||||
# This script is baked into the appsmith-editor Dockerfile and is used to boot Nginx when the Docker container starts
|
||||
# Refer: /app/client/Dockerfile
|
||||
set -ue
|
||||
cat /nginx.conf.template | envsubst "$(printf '$%s,' $(env | grep -Eo '^APPSMITH_[A-Z0-9_]+'))" | sed -e 's|\${\(APPSMITH_[A-Z0-9_]*\)}||g' > /etc/nginx/conf.d/default.conf
|
||||
cat /nginx-root.conf.template | envsubst "$(printf '$%s,' $(env | grep -Eo '^APPSMITH_[A-Z0-9_]+'))" | sed -e 's|\${\(APPSMITH_[A-Z0-9_]*\)}||g' > /etc/nginx/nginx.conf
|
||||
exec nginx -g 'daemon off;'
|
||||
|
|
|
|||
41
app/client/docker/templates/nginx-root.conf.template
Normal file
41
app/client/docker/templates/nginx-root.conf.template
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
user nginx;
|
||||
worker_processes 1;
|
||||
|
||||
error_log /var/log/nginx/error.log warn;
|
||||
pid /var/run/nginx.pid;
|
||||
|
||||
events {
|
||||
worker_connections 1024;
|
||||
}
|
||||
|
||||
|
||||
http {
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
|
||||
log_format main '"$time_local" client=$remote_addr '
|
||||
'method=$request_method request="$request" '
|
||||
'request_length=$request_length '
|
||||
'status=$status bytes_sent=$bytes_sent '
|
||||
'body_bytes_sent=$body_bytes_sent '
|
||||
'referer=$http_referer '
|
||||
'http_x_forwarded_for=$http_x_forwarded_for '
|
||||
'user_agent="$http_user_agent" '
|
||||
'upstream_addr=$upstream_addr '
|
||||
'upstream_status=$upstream_status '
|
||||
'request_time=$request_time '
|
||||
'upstream_response_time=$upstream_response_time '
|
||||
'upstream_connect_time=$upstream_connect_time '
|
||||
'upstream_header_time=$upstream_header_time';
|
||||
|
||||
access_log /var/log/nginx/access.log main;
|
||||
|
||||
sendfile on;
|
||||
#tcp_nopush on;
|
||||
|
||||
keepalive_timeout 65;
|
||||
|
||||
#gzip on;
|
||||
|
||||
include /etc/nginx/conf.d/*.conf;
|
||||
}
|
||||
|
|
@ -51,7 +51,8 @@ case "${unameOut}" in
|
|||
Starting nginx for Linux...
|
||||
"
|
||||
cat ./docker/templates/nginx-linux.conf.template | envsubst ${vars_to_substitute} | sed -e 's|\${\(APPSMITH_[A-Z0-9_]*\)}||g' > ./docker/nginx.conf &&
|
||||
sudo docker run --network host --name wildcard-nginx -d -p 80:80 -p 443:443 -v `pwd`/docker/nginx.conf:/etc/nginx/conf.d/app.conf -v `pwd`/docker/_wildcard.appsmith.com.pem:/etc/certificate/dev.appsmith.com.pem -v `pwd`/docker/_wildcard.appsmith.com-key.pem:/etc/certificate/dev.appsmith.com-key.pem nginx:latest \
|
||||
cat ./docker/templates/nginx-root.conf.template | envsubst ${vars_to_substitute} | sed -e 's|\${\(APPSMITH_[A-Z0-9_]*\)}||g' > ./docker/nginx-root.conf &&
|
||||
sudo docker run --network host --name wildcard-nginx -d -p 80:80 -p 443:443 -v `pwd`/docker/nginx-root.conf:/etc/nginx/nginx.conf -v `pwd`/docker/nginx.conf:/etc/nginx/conf.d/app.conf -v `pwd`/docker/_wildcard.appsmith.com.pem:/etc/certificate/dev.appsmith.com.pem -v `pwd`/docker/_wildcard.appsmith.com-key.pem:/etc/certificate/dev.appsmith.com-key.pem nginx:latest \
|
||||
&& echo "
|
||||
nginx is listening on port 443 and forwarding to port 3000
|
||||
visit https://dev.appsmith.com
|
||||
|
|
@ -62,7 +63,8 @@ case "${unameOut}" in
|
|||
Starting nginx for MacOS...
|
||||
"
|
||||
cat ./docker/templates/nginx-mac.conf.template | envsubst ${vars_to_substitute} | sed -e 's|\${\(APPSMITH_[A-Z0-9_]*\)}||g' > ./docker/nginx.conf &&
|
||||
docker run --name wildcard-nginx -d -p 80:80 -p 443:443 -v `pwd`/docker/nginx.conf:/etc/nginx/conf.d/app.conf -v `pwd`/docker/_wildcard.appsmith.com.pem:/etc/certificate/dev.appsmith.com.pem -v `pwd`/docker/_wildcard.appsmith.com-key.pem:/etc/certificate/dev.appsmith.com-key.pem nginx:latest \
|
||||
cat ./docker/templates/nginx-root.conf.template | envsubst ${vars_to_substitute} | sed -e 's|\${\(APPSMITH_[A-Z0-9_]*\)}||g' > ./docker/nginx-root.conf &&
|
||||
docker run --name wildcard-nginx -d -p 80:80 -p 443:443 -v `pwd`/docker/nginx-root.conf:/etc/nginx/nginx.conf -v `pwd`/docker/nginx.conf:/etc/nginx/conf.d/app.conf -v `pwd`/docker/_wildcard.appsmith.com.pem:/etc/certificate/dev.appsmith.com.pem -v `pwd`/docker/_wildcard.appsmith.com-key.pem:/etc/certificate/dev.appsmith.com-key.pem nginx:latest \
|
||||
&& echo "
|
||||
nginx is listening on port 443 and forwarding to port 3000
|
||||
visit https://dev.appsmith.com
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user