(SIO-2356) Fix supervisor.conf template and upgrading info. Add hooks…

… for Docker Hub. Change-Id: I55b1b3da935f4b061642d4188b289115219999cc
sio2project · May 19, 2020 · 3aaf11e · 3aaf11e
1 parent a40a6c7
commit 3aaf11e
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 46 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,14 +1,39 @@
-Dockerfile*
-docker*
-.dockerignore
-.git
-.github
-.idea
-*.swp
-venv
-logs
-deployment
-extra
+# use syntax common to .gitignore and .dockerignore
+
+# /rst/source/sections/modules.rst
+/build/
+/dist/
+# /test_report.html
+# /test_report/
+# /test_log.txt
+# /test_screenshots.tar.gz
+/.coverage
+/cover/
+**/*.egg
+**/*.egg-info
+**/*.pid
+**/.DS_Store
+**/*.pyc
+**/__pycache__/
+**/*.kdev*
+**/*~
+/.tox/
+/.pytest_cache/
+/.eggs/
+**/*.swp
+/deployment/
+/venv*/
+/.idea/
+
+# docker specific
+
+/Dockerfile*
+/docker*
+/.dockerignore
+/.git
+/.gitignore
+/.github
+/extra/
 /test*
-*.rst
-/rst
+/*.rst
+/rst/
diff --git a/.gitignore b/.gitignore
@@ -1,25 +1,26 @@
+# use syntax common to .gitignore and .dockerignore
+
 /rst/source/sections/modules.rst
 /build/
 /dist/
 /test_report.html
 /test_report/
-/.coverage
-/cover/
-*.egg
-*.egg-info
-*.pid
-.DS_Store
-/.vagrant/
-*.pyc
-*.kdev*
-*~
-vagrant.yml
 /test_log.txt
 /test_screenshots.tar.gz
-/logs/
+/.coverage
+/cover/
+**/*.egg
+**/*.egg-info
+**/*.pid
+**/.DS_Store
+**/*.pyc
+**/__pycache__/
+**/*.kdev*
+**/*~
 /.tox/
 /.pytest_cache/
 /.eggs/
-*.swp
+**/*.swp
 /deployment/
-/venv/
+/venv*/
+/.idea/
diff --git a/UPGRADING.rst b/UPGRADING.rst
@@ -871,16 +871,43 @@ List of changes since the *CONFIG_VERSION* numbering was introduced:
      To make sure that your typical production setup (UWSGI + reverse proxy)
      keeps working, set this to 'uwsgi'.::
 
-        @@ -28,12 +27,20 @@ SITE_NAME = 'OIOIOI'
-         # including but not limited to the mail notifications.
-         PUBLIC_ROOT_URL = 'http://localhost'
-
-        -# Run uwsgi daemon. Shall be True, False or 'auto'.
-        -# 'auto' means daemon will be run iff DEBUG is disabled.
-        -UWSGI_ENABLED = 'auto'
+        --- a/oioioi/deployment/settings.py.template
+        +++ b/oioioi/deployment/settings.py.template
+        @@ -34,0 +38,6 @@
         +# The server to be run. Options are:
-        +# django - django's http server
-        +# uwsgi - uwsgi daemon
-        +# uwsgi-http - uwsgi deamon with builtin http server
+        +# 'django' - django's http server
+        +# 'uwsgi' - uwsgi daemon
+        +# 'uwsgi-http' - uwsgi deamon with built-in http server
         +# None - nothing will be run
-        +SERVER = None
+        +SERVER = 'django'
+
+   * Appropriate changes were also made to the supervisor configuration.::
+
+        --- a/oioioi/deployment/supervisord.conf.template
+        +++ b/oioioi/deployment/supervisord.conf.template
+        @@ -7,17 +7,19 @@ directory={{ PROJECT_DIR }}
+         identifier=oioioi-supervisor
+
+         [program:uwsgi]
+        -{% if settings.UWSGI_USE_GEVENT %}
+        -command=uwsgi -s {{ PROJECT_DIR }}/uwsgi.sock --umask=000 --loop=gevent --async=50 --processes=10 -M --max-requests=5000 --disable-logging --need-app --enable-threads --socket-timeout=30 --wsgi-file={{ PROJECT_DIR }}/wsgi.py
+        -{% else %}
+        -command=uwsgi -s {{ PROJECT_DIR }}/uwsgi.sock --umask=000 --processes=10 -M --max-requests=5000 --disable-logging --need-app --enable-threads --socket-timeout=30 --wsgi-file={{ PROJECT_DIR }}/wsgi.py
+        -{% endif %}
+        +command=uwsgi {% if settings.SERVER == 'uwsgi-http' %}--http :8000 --static-map {{ settings.STATIC_URL }}={{ settings.STATIC_ROOT }} {% else %}-s {{ PROJECT_DIR }}/uwsgi.sock {% endif %}--umask=000 {% if settings.UWSGI_USE_GEVENT %}--loop=gevent --async=50 {% endif %}--processes=10 -M --max-requests=5000 --disable-logging --need-app --enable-threads --socket-timeout=30 --wsgi-file={{ PROJECT_DIR }}/wsgi.py
+         stopsignal=INT
+         startretries=0
+         redirect_stderr=false
+         stdout_logfile={{ PROJECT_DIR }}/logs/uwsgi.log
+         stderr_logfile={{ PROJECT_DIR }}/logs/uwsgi-err.log
+        -{% if settings.UWSGI_ENABLED == False %}exclude=true{% elif settings.UWSGI_ENABLED == 'auto' and settings.DEBUG %}exclude=true{% endif %}
+        +{% if settings.SERVER|slice:":5" != 'uwsgi' %}exclude=true{% endif %}
+        +
+        +[program:django-http]
+        +command={{ PYTHON }} {{ PROJECT_DIR }}//manage.py runserver 0.0.0.0:8000
+        +stdout_logfile={{ PROJECT_DIR }}/logs/runserver/out.log
+        +stderr_logfile={{ PROJECT_DIR }}/logs/runserver/err.log
+        +{% if settings.SERVER != 'django' %}exclude=true{% endif %}
+
+         [program:rankingsd]
+         command={{ PYTHON }} {{ PROJECT_DIR }}/manage.py rankingsd
diff --git a/docker-compose-selenium.yml b/docker-compose-selenium.yml
@@ -9,7 +9,7 @@ services:
       POSTGRES_DB: "oioioi"
     stop_grace_period: 1m
   web:
-    image: sio2project/oioioi
+    image: sio2project/oioioi-selenium
     command: ["/sio2/oioioi/selenium_init.sh"]
     build:
       context: .
@@ -25,7 +25,7 @@ services:
       - db
       - broker
   worker:
-    image: sio2project/oioioi
+    image: sio2project/oioioi-selenium
     command: ["/sio2/oioioi/worker_init.sh"]
     cap_add:
       - ALL

diff --git a/hooks/build b/hooks/build
@@ -0,0 +1 @@
+docker build --add-host=web:127.0.0.1 -f $DOCKERFILE_PATH -t $IMAGE_NAME .
diff --git a/oioioi/default_settings.py b/oioioi/default_settings.py
@@ -24,9 +24,9 @@
 PUBLIC_ROOT_URL = 'http://localhost'
 
 # The server to be run. Options are:
-# django - django's http server
-# uwsgi - uwsgi daemon
-# uwsgi-http - uwsgi deamon with builtin http server
+# 'django' - django's http server
+# 'uwsgi' - uwsgi daemon
+# 'uwsgi-http' - uwsgi deamon with built-in http server
 # None - nothing will be run
 SERVER = None
 

diff --git a/oioioi/deployment/settings.py.template b/oioioi/deployment/settings.py.template
@@ -38,7 +38,7 @@ ALLOWED_HOSTS = []
 # The server to be run. Options are:
 # 'django' - django's http server
 # 'uwsgi' - uwsgi daemon
-# 'uwsgi-http' - uwsgi deamon with builtin http server
+# 'uwsgi-http' - uwsgi deamon with built-in http server
 # None - nothing will be run
 SERVER = 'django'
 

diff --git a/oioioi/deployment/supervisord.conf.template b/oioioi/deployment/supervisord.conf.template
@@ -17,8 +17,8 @@ stderr_logfile={{ PROJECT_DIR }}/logs/uwsgi-err.log
 
 [program:django-http]
 command={{ PYTHON }} {{ PROJECT_DIR }}//manage.py runserver 0.0.0.0:8000
-stdout_logfile={{ PROJECT_DIR }}/logs/runserver/out.log
-stderr_logfile={{ PROJECT_DIR }}/logs/runserver/err.log
+stdout_logfile={{ PROJECT_DIR }}/logs/runserver.log
+stderr_logfile={{ PROJECT_DIR }}/logs/runserver-err.log
 {% if settings.SERVER != 'django' %}exclude=true{% endif %}
 
 [program:rankingsd]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		docker build --add-host=web:127.0.0.1 -f $DOCKERFILE_PATH -t $IMAGE_NAME .