From 6ea836e0728987ac990f1b0716932487065caad6 Mon Sep 17 00:00:00 2001 From: kev Date: Thu, 24 Dec 2015 11:49:38 +0800 Subject: [PATCH] update h2o --- h2o/Dockerfile | 10 +++++++--- h2o/arm/Dockerfile | 10 +++++++--- h2o/docker-compose.yml | 7 +++++++ 3 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 h2o/docker-compose.yml diff --git a/h2o/Dockerfile b/h2o/Dockerfile index 58dcb30..65ac84d 100644 --- a/h2o/Dockerfile +++ b/h2o/Dockerfile @@ -5,17 +5,21 @@ FROM alpine MAINTAINER kev +ENV H2O_VER 1.6.1 +ENV H2O_URL https://github.com/h2o/h2o/archive/v${H2O_VER}.tar.gz +ENV H2O_DIR h2o-${H2O_VER} + RUN apk add -U build-base \ cmake \ curl \ linux-headers \ zlib-dev \ - && curl -sSL https://github.com/h2o/h2o/archive/master.tar.gz | tar xz \ - && cd h2o-master \ + && curl -sSL ${H2O_URL} | tar xz \ + && cd ${H2O_DIR} \ && cmake -DWITH_BUNDLED_SSL=on . \ && make install \ && cd .. \ - && rm -rf h2o-master \ + && rm -rf ${H2O_DIR} \ && apk del build-base \ cmake \ curl \ diff --git a/h2o/arm/Dockerfile b/h2o/arm/Dockerfile index f4536f3..acd9d9f 100644 --- a/h2o/arm/Dockerfile +++ b/h2o/arm/Dockerfile @@ -5,17 +5,21 @@ FROM vimagick/alpine-arm MAINTAINER kev +ENV H2O_VER 1.6.1 +ENV H2O_URL https://github.com/h2o/h2o/archive/v${H2O_VER}.tar.gz +ENV H2O_DIR h2o-${H2O_VER} + RUN apk add -U build-base \ cmake \ curl \ linux-headers \ zlib-dev \ - && curl -sSL https://github.com/h2o/h2o/archive/master.tar.gz | tar xz \ - && cd h2o-master \ + && curl -sSL ${H2O_URL} | tar xz \ + && cd ${H2O_DIR} \ && cmake -DWITH_BUNDLED_SSL=on . \ && make install \ && cd .. \ - && rm -rf h2o-master \ + && rm -rf ${H2O_DIR} \ && apk del build-base \ cmake \ curl \ diff --git a/h2o/docker-compose.yml b/h2o/docker-compose.yml new file mode 100644 index 0000000..d98c66d --- /dev/null +++ b/h2o/docker-compose.yml @@ -0,0 +1,7 @@ +h2o: + image: vimagick/h2o-arm + ports: + - "8080:80" + volumes: + - "./html:/var/www/html" + restart: always