diff options
| author | jfriedli | 2019-08-28 09:32:04 -0700 |
|---|---|---|
| committer | jvoisin | 2019-08-28 09:32:04 -0700 |
| commit | c96d3b8178a007af747b9a5922e03c2ab2c47a6f (patch) | |
| tree | 87944eaadb46fe4dfe4622b1f2e6d963d198f60b | |
| parent | 3a3d1227558a2c405456e3ddab451675e7bbd552 (diff) | |
removed startup script
| -rw-r--r-- | Dockerfile.production | 5 | ||||
| -rw-r--r-- | startup-server.sh | 3 |
2 files changed, 2 insertions, 6 deletions
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 \ | |||
| 18 | && cp ./config/uwsgi.config /etc/uwsgi/apps-enabled/mat2-web.ini \ | 18 | && cp ./config/uwsgi.config /etc/uwsgi/apps-enabled/mat2-web.ini \ |
| 19 | && rm /etc/nginx/sites-enabled/default \ | 19 | && rm /etc/nginx/sites-enabled/default \ |
| 20 | && mkdir -p /etc/nginx/sites-enabled/ \ | 20 | && mkdir -p /etc/nginx/sites-enabled/ \ |
| 21 | && cp ./config/nginx.config /etc/nginx/sites-enabled/mat2.conf \ | 21 | && cp ./config/nginx.config /etc/nginx/sites-enabled/mat2.conf |
| 22 | && chmod +x ./startup-server.sh | ||
| 23 | 22 | ||
| 24 | CMD ["./startup-server.sh"] \ No newline at end of file | 23 | 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 @@ | |||
| 1 | #!/bin/bash | ||
| 2 | /etc/init.d/nginx restart | ||
| 3 | uwsgi --ini /etc/uwsgi/apps-enabled/mat2-web.ini \ No newline at end of file | ||