Yippie/docker-ubuntu
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

feat: add Docker HEALTHCHECK (issue #69)

Browse source
This commit is contained in:
DoroWu 2018-04-22 23:00:48 +08:00
parent ba3e2c2595
commit e2d659d992
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Dockerfile
View file

@ -90,4 +90,5 @@ EXPOSE 80
WORKDIR /root WORKDIR /root
ENV HOME=/home/ubuntu \ ENV HOME=/home/ubuntu \
SHELL=/bin/bash SHELL=/bin/bash
HEALTHCHECK --interval=30s --timeout=5s CMD curl --fail http://127.0.0.1/api/health
ENTRYPOINT ["/startup.sh"] ENTRYPOINT ["/startup.sh"]

8
image/usr/local/lib/web/backend/vnc/app.py
View file

@ -8,6 +8,7 @@ from flask import (
request, request,
Response, Response,
jsonify, jsonify,
abort,
) )
from gevent import subprocess as gsp, spawn, sleep from gevent import subprocess as gsp, spawn, sleep
from geventwebsocket.exceptions import WebSocketError from geventwebsocket.exceptions import WebSocketError
@ -35,6 +36,13 @@ def apistate():
}) })
@app.route('/api/health')
def apihealth():
if state.health:
return 'success'
abort(503, 'unhealthy')
@app.route('/api/reset') @app.route('/api/reset')
def reset(): def reset():
if 'w' in request.args and 'h' in request.args: if 'w' in request.args and 'h' in request.args:

3
image/usr/local/lib/web/backend/vnc/state.py
View file

@ -27,9 +27,6 @@ class State(object):
self._event.set() self._event.set()
def _update_health(self): def _update_health(self):
if self._health:
return
health = True health = True
output = gsp.check_output(['supervisorctl', 'status']) output = gsp.check_output(['supervisorctl', 'status'])
for line in output.strip().split('\n'): for line in output.strip().split('\n'):