Skip to content

Commit 47a5c4f

Browse files
committed
Simplify entrypoint
1 parent 4f30157 commit 47a5c4f

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

backend/resources/entrypoint.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,25 @@ until pg_isready --host="${POSTGRES_HOST}" --username="${POSTGRES_USER}" --quiet
66
sleep 1;
77
done
88

9-
touch -a /mentorpunten/log/uwsgi.log
10-
touch -a /mentorpunten/log/django.log
11-
12-
cd /mentorpunten/src/website
9+
cd /app/website
1310

1411
./manage.py migrate --no-input
1512

16-
chown --recursive www-data:www-data /mentorpunten/
17-
1813
printenv > /etc/environment
1914

2015
cron
2116

2217
echo "Starting uwsgi server."
23-
uwsgi --chdir=/mentorpunten/src/website \
18+
uwsgi --chdir=/app/website \
2419
--module=mentorpunten.wsgi:application \
2520
--master --pidfile=/tmp/project-master.pid \
2621
--socket=:8000 \
2722
--processes=5 \
28-
--uid=www-data --gid=www-data \
2923
--harakiri=20 \
3024
--post-buffering=16384 \
3125
--max-requests=5000 \
3226
--thunder-lock \
3327
--vacuum \
34-
--logfile-chown \
35-
--logto2=/mentorpunten/log/uwsgi.log \
3628
--ignore-sigpipe \
3729
--ignore-write-errors \
3830
--disable-write-exception

infra/nginx/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ RUN npm run build-only
1212

1313
FROM jonasal/nginx-certbot:4.3-alpine
1414

15-
COPY infra/nginx/nginx.conf /etc/nginx/nginx.conf
15+
COPY infra/nginx/nginx.conf /etc/nginx/conf.d/scavengerhunt.conf
1616
COPY --from=builder /app/dist /frontend
1717

0 commit comments

Comments
 (0)