Skip to content

Commit

Permalink
try to nginxify
Browse files Browse the repository at this point in the history
  • Loading branch information
ewdurbin committed Aug 9, 2023
1 parent 81c7ee6 commit c713109
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 5 deletions.
1 change: 1 addition & 0 deletions Dockerfile.cabotage
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM python:3.9-bullseye
COPY --from=ewdurbin/nginx-static:1.25.x /usr/bin/nginx /usr/bin/nginx
ENV PYTHONUNBUFFERED=1
ENV PYTHONDONTWRITEBYTECODE=1
RUN mkdir /code
Expand Down
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
release: python manage.py migrate --noinput
web: gunicorn -c gunicorn.conf pydotorg.wsgi
web: bin/start-nginx gunicorn -c gunicorn.conf pydotorg.wsgi
69 changes: 69 additions & 0 deletions bin/start-nginx
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#!/usr/bin/env bash

psmgr=/tmp/nginx-buildpack-wait
rm -f $psmgr
mkfifo $psmgr

n=1
while getopts :f option ${@:1:2}
do
case "${option}"
in
f) FORCE=$OPTIND; n=$((n+1));;
esac
done

# Initialize log directory.
mkdir -p logs/nginx
touch logs/nginx/access.log logs/nginx/error.log
echo 'buildpack=nginx at=logs-initialized'

# Start log redirection.
(
# Redirect nginx logs to stdout.
tail -qF -n 0 logs/nginx/*.log
echo 'logs' >$psmgr
) &

# Start App Server
(
# Take the command passed to this bin and start it.
# E.g. bin/start-nginx bundle exec unicorn -c config/unicorn.rb
COMMAND=${@:$n}
echo "buildpack=nginx at=start-app cmd=$COMMAND"
$COMMAND
echo 'app' >$psmgr
) &

if [[ -z "$FORCE" ]]
then
FILE="/tmp/app-initialized"

# We block on app-initialized so that when nginx binds to $PORT
# are app is ready for traffic.
while [[ ! -f "$FILE" ]]
do
echo 'buildpack=nginx at=app-initialization'
sleep 1
done
echo 'buildpack=nginx at=app-initialized'
fi

# Start nginx
(
# We expect nginx to run in foreground.
# We also expect a socket to be at /tmp/nginx.socket.
echo 'buildpack=nginx at=nginx-start'
/usr/bin/nginx -p . -c config/nginx.conf
echo 'nginx' >$psmgr
) &

# This read will block the process waiting on a msg to be put into the fifo.
# If any of the processes defined above should exit,
# a msg will be put into the fifo causing the read operation
# to un-block. The process putting the msg into the fifo
# will use it's process name as a msg so that we can print the offending
# process to stdout.
read exit_process <$psmgr
echo "buildpack=nginx at=exit process=$exit_process"
exit 1
5 changes: 2 additions & 3 deletions config/nginx.conf.erb → config/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
daemon off;
#Heroku dynos have at least 4 cores.
worker_processes <%= ENV['NGINX_WORKERS'] || 4 %>;
worker_processes 2

events {
use epoll;
Expand Down Expand Up @@ -33,7 +32,7 @@ http {
}

server {
listen <%= ENV["PORT"] %>;
listen unix:/var/run/cabotage/cabotage.sock;
server_name _;
keepalive_timeout 5;

Expand Down
2 changes: 1 addition & 1 deletion gunicorn.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
bind = 'unix:/var/run/cabotage/cabotage.sock'
bind = 'unix:/tmp/nginx.sock'
backlog = 1024
preload_app = True
max_requests = 2048
Expand Down

0 comments on commit c713109

Please sign in to comment.