From c96d3b8178a007af747b9a5922e03c2ab2c47a6f Mon Sep 17 00:00:00 2001 From: jfriedli Date: Wed, 28 Aug 2019 09:32:04 -0700 Subject: [PATCH] removed startup script --- Dockerfile.production | 5 ++--- startup-server.sh | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 startup-server.sh diff --git a/Dockerfile.production b/Dockerfile.production index 1d5b0a1..604adae 100644 --- a/Dockerfile.production +++ b/Dockerfile.production @@ -18,7 +18,6 @@ RUN apt-get update \ && cp ./config/uwsgi.config /etc/uwsgi/apps-enabled/mat2-web.ini \ && rm /etc/nginx/sites-enabled/default \ && mkdir -p /etc/nginx/sites-enabled/ \ -&& cp ./config/nginx.config /etc/nginx/sites-enabled/mat2.conf \ -&& chmod +x ./startup-server.sh +&& cp ./config/nginx.config /etc/nginx/sites-enabled/mat2.conf -CMD ["./startup-server.sh"] \ No newline at end of file +CMD ["sh", "-c", "/etc/init.d/nginx restart; uwsgi --ini /etc/uwsgi/apps-enabled/mat2-web.ini"] \ No newline at end of file diff --git a/startup-server.sh b/startup-server.sh deleted file mode 100644 index d4449f7..0000000 --- a/startup-server.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -/etc/init.d/nginx restart -uwsgi --ini /etc/uwsgi/apps-enabled/mat2-web.ini \ No newline at end of file