Add CI and docker build

Author: jsks

.dockerignore

@@ -0,0 +1 @@
+.git

.travis.yml

@@ -0,0 +1,16 @@
+language: minimal
+
+services:
+    - docker
+
+before_install:
+    - docker build -t jsks/czhttpd .
+
+script:
+    - docker run jsks/czhttpd make
+
+after_success:
+    - if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then
+        echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin;
+        docker push jsks/czhttpd;
+      fi

Dockerfile

@@ -0,0 +1,19 @@
+FROM zshusers/zsh-master
+
+RUN rm -rf /usr/share/zsh/*/scripts/newuser
+RUN install_packages make
+
+RUN groupadd czhttpd \
+        && useradd -m -g czhttpd -d /home/czhttpd -s /sbin/nologin czhttpd
+USER czhttpd
+
+ENV APP=/home/czhttpd/src
+RUN mkdir -p $APP/modules/ $APP/test/
+COPY --chown=czhttpd:czhttpd czhttpd Makefile $APP/
+COPY --chown=czhttpd:czhttpd modules/ $APP/modules/
+COPY --chown=czhttpd:czhttpd test/ $APP/test/
+
+WORKDIR $APP
+RUN make clean
+
+CMD ["zsh", "czhttpd", "-v"]

test/integration/test.sh

@@ -10,7 +10,7 @@ fi
 
 for i in datetime pcre stat system; zmodload zsh/$i || exit 127
 
-setopt err_return rematch_pcre
+setopt rematch_pcre
 
 typeset -gA STATS
 STATS[count]=0

test/stress/stress.sh

@@ -9,8 +9,6 @@ if [[ -t 1 ]] && (( $terminfo[colors] >= 8 )); then
     colors
 fi
 
-setopt err_return
-
 which vegeta >/dev/null || error "Missing vegeta, unable to run stress tests"
 
 typeset -g VEGETA_OPTS VERBOSE DURATION

test/utils.sh

@@ -1,7 +1,7 @@
 # Utility functions/variables for testing czhttpd
 ###
 
-setopt local_options
+setopt err_return local_options
 
 typeset -g SRC_DIR TESTTMP TESTROOT CONF PORT
 
@@ -68,6 +68,9 @@ function reload_conf() {
 }
 
 function cleanup() {
+    # Return value of previous command before trap was triggered
+    private rv=$?
+
     setopt noerr_return
     stop_server
 
@@ -76,6 +79,8 @@ function cleanup() {
     [[ -d "/tmp/cztest-$$" ]] && rm -rf "/tmp/cztest-$$"
 
     rm -rf $SRC_DIR/.czhttpd-pid
+
+    return $rv
 }
 
-trap "cleanup; exit" INT TERM KILL EXIT ZERR
+trap "cleanup" INT TERM KILL EXIT