This repository was archived by the owner on Dec 13, 2018. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +6
-3
lines changed Expand file tree Collapse file tree 4 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ ENV RSYSLOG_DESTINATION=127.0.0.1 \
2222 STATS_AUTH="stats:stats" \
2323 SSL_BIND_OPTIONS=no-sslv3 \
2424 SSL_BIND_CIPHERS="ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:DHE-DSS-AES128-SHA:DES-CBC3-SHA" \
25- HEALTH_CHECK="check"
25+ HEALTH_CHECK="check inter 2000 rise 2 fall 3 "
2626
2727EXPOSE 80 443 1936
2828ENTRYPOINT ["tini" , "--" ]
Original file line number Diff line number Diff line change 1+ #! /bin/sh
2+ docker run -v $( pwd) :/app --privileged tutum/dind bash -c ' eval "wrapdocker > /dev/null 2>&1 &" && apt-get update && apt-get install -y curl python-pip python-dev && cd app && ./test.sh'
Original file line number Diff line number Diff line change 33set -e
44
55echo ======================== Unit Test ==========================
6- python setup.py install
6+ pip install -r requirements.txt
77pip install -r test-requirements.txt
8+ python setup.py install
89nosetests -v --with-coverage --cover-package haproxy
910
1011if [ " $( uname -s) " != " Darwin" ]; then
Original file line number Diff line number Diff line change @@ -43,7 +43,7 @@ cleanup
4343echo
4444
4545echo " => Building haproxy image"
46- docker build -t haproxy .
46+ docker tag this haproxy || docker build -t haproxy .
4747echo
4848
4949echo " => Creating certificates"
You can’t perform that action at this time.
0 commit comments