Merge branch 'master' of github.com:WPO-Foundation/webpagetest

Dockerfile

@@ -17,6 +17,7 @@ RUN echo deb http://www.deb-multimedia.org jessie main non-free >> /etc/apt/sour
     python \
     python-pillow \
     cron \
+    beanstalkd \
     supervisor && \
     \
     DEBIAN_FRONTEND=noninteractive apt-get install -q -y --force-yes\
@@ -57,10 +58,11 @@ COPY docker/server/config/php.ini /usr/local/etc/php/
 COPY docker/server/config/apache2.conf /etc/apache2/apache2.conf
 COPY docker/server/config/crontab /etc/crontab
 
-# config supervisor to run apache AND cron
+# config supervisor to run apache, cron, beanstalkd
 COPY docker/server/config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY docker/server/config/supervisord/supervisord_apache.conf /etc/supervisor/conf.d/supervisord_apache.conf
 COPY docker/server/config/supervisord/supervisord_cron.conf /etc/supervisor/conf.d/supervisord_cron.conf
+COPY docker/server/config/supervisord/supervisord_beanstalkd.conf /etc/supervisor/conf.d/supervisord_beanstalkd.conf
 
 # copy script to run WPT cron scripts
 COPY docker/server/scripts/wpt_cron_call.sh /scripts/wpt_cron_call.sh

docker/server/config/supervisord/supervisord_beanstalkd.conf

@@ -0,0 +1,6 @@
+[program:beanstalk]
+command = beanstalkd -l 127.0.0.1 -p 11300
+autostart = true
+autorestart = true
+stderr_logfile = /var/log/supervisor/beanstalk_stderr.log
+stdout_logfile = /var/log/supervisor/beanstalk_stdout.log

www/traceroute.php

@@ -112,7 +112,7 @@
                                 Number of Tests to Run<br>
                                 <small>Up to <?php echo $settings['maxruns']; ?></small>
                             </label>
-                            <input id="number_of_tests" type="text" class="text short" name="runs" value="3">
+                            <input id="number_of_tests" type="number"  class="text short" name="runs" value="3">
                         </li>
                     </ul>
                 </div>