diff --git a/.gitignore b/.gitignore index a2f2f50..33f967f 100644 --- a/.gitignore +++ b/.gitignore @@ -32,5 +32,9 @@ utils/bombardment utils/siege.config utils/siege2csv.pl +# Docker +docker/build/ + # Others tags + diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..387873c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,19 @@ +language: c + +sudo: required + +services: + - docker + +before_install: + - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" + - docker pull ubuntu + - cd docker + - ./run.sh + - export REPO=jstarcher/siege + - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` + - docker build -t $REPO:$TAG . + - docker push $REPO + +script: + - docker run --rm -t jstarcher/siege -c1 -r1 jstarcher.com diff --git a/README.md b/README.md index 122efe2..983344f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![Build Status](https://travis-ci.org/jstarcher/siege.svg?branch=master)](https://travis-ci.org/jstarcher/siege) Siege README diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..5858882 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,10 @@ +FROM frolvlad/alpine-glibc:alpine-3.5 + +COPY build/siege /usr/bin/siege +COPY build/siege.config /usr/bin/siege.config +COPY build/bombardment /usr/bin/bombardment + +ENTRYPOINT ["siege"] + +CMD ["--help"] + diff --git a/docker/compile.sh b/docker/compile.sh new file mode 100644 index 0000000..aa598bb --- /dev/null +++ b/docker/compile.sh @@ -0,0 +1,14 @@ +apt-get update \ +&& apt-get install -y build-essential automake curl openssl jq zlib1g-dev \ +&& LATEST=$(curl -s https://api.github.com/repos/JoeDog/siege/tags | jq --raw-output '.[0]["tarball_url"]') \ +&& curl -L -o siege.tar.gz $LATEST \ +&& tar xvvzf siege.tar.gz \ +&& cd JoeDog* \ +&& utils/bootstrap \ +&& ./configure \ +&& make \ +&& make install \ +&& cp /usr/local/bin/siege /opt/siege \ +&& cp /usr/local/bin/bombardment /opt/siege \ +&& cp /usr/local/bin/siege.config /opt/siege + diff --git a/docker/run.sh b/docker/run.sh new file mode 100755 index 0000000..0960d7a --- /dev/null +++ b/docker/run.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +rm -rf build +mkdir build + +docker run --rm -t -v $PWD/build:/opt/siege -v $PWD/compile.sh:/opt/compile.sh ubuntu bash /opt/compile.sh +docker build . -t jstarcher/siege:latest diff --git a/src/hash.c b/src/hash.c index 248ad34..f4bec3f 100644 --- a/src/hash.c +++ b/src/hash.c @@ -23,6 +23,8 @@ # include #endif/*HAVE_CONFIG_H*/ +#include + #include #include #include