From c86972e12f0cca31b42a5e619d962aaa87e7ecc2 Mon Sep 17 00:00:00 2001 From: Martin Honermeyer Date: Sun, 23 Aug 2015 23:20:09 +0200 Subject: [PATCH 1/4] Fix Dockerfile to install a newer OpenSSL version (The old version is not downloadable anymore.) --- deploy/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 3ac4db9cb7..07a21994cb 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -56,7 +56,7 @@ RUN curl -sL http://downloads.webmproject.org/releases/webp/libwebp-${LIBWEBP_VE RUN cd libwebp-${LIBWEBP_VER} && ./configure --prefix=/usr --enable-static --disable-shared && make all -j${NUM_CORES} && make install # OpenSSL -ENV OPENSSL_VER=1.0.2a +ENV OPENSSL_VER=1.0.2d RUN curl -sL http://openssl.org/source/openssl-${OPENSSL_VER}.tar.gz | tar -xz RUN cd openssl-${OPENSSL_VER} && ./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib && make all && make install From 355ef227aecf238c441b2e44c8e7bba1891bfe61 Mon Sep 17 00:00:00 2001 From: Martin Honermeyer Date: Sun, 23 Aug 2015 23:23:01 +0200 Subject: [PATCH 2/4] Use code from current checkout in Docker build The Dockerfile was moved to the project root for this to work. --- deploy/Dockerfile => Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename deploy/Dockerfile => Dockerfile (98%) diff --git a/deploy/Dockerfile b/Dockerfile similarity index 98% rename from deploy/Dockerfile rename to Dockerfile index 07a21994cb..8d08b342c6 100644 --- a/deploy/Dockerfile +++ b/Dockerfile @@ -96,7 +96,7 @@ RUN cd icu/source && ./configure --prefix=/usr --enable-static --disable-shared ENV PHANTOMJS_TAG=master RUN apt-get install -y git #RUN git clone https://github.com/ariya/phantomjs.git -RUN git clone https://github.com/bprodoehl/phantomjs.git +COPY . phantomjs CMD cd phantomjs && git checkout ${PHANTOMJS_TAG} && ./build.sh --confirm && cp bin/phantomjs /output/. From 232b8e2d72d8537dfb03d6d1bb05c367b5d2e752 Mon Sep 17 00:00:00 2001 From: Martin Honermeyer Date: Sun, 23 Aug 2015 23:24:53 +0200 Subject: [PATCH 3/4] Compile project during the Docker build instead of during run --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d08b342c6..2c6f46a2d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -98,5 +98,5 @@ RUN apt-get install -y git #RUN git clone https://github.com/ariya/phantomjs.git COPY . phantomjs -CMD cd phantomjs && git checkout ${PHANTOMJS_TAG} && ./build.sh --confirm && cp bin/phantomjs /output/. - +RUN cd phantomjs && git checkout ${PHANTOMJS_TAG} && ./build.sh --confirm +CMD cp phantomjs/bin/phantomjs /output/. From 7e49a1b27b0253cfa9a52b87d3e3ea62a40f9cd9 Mon Sep 17 00:00:00 2001 From: Martin Honermeyer Date: Wed, 20 Jan 2016 08:30:58 +0100 Subject: [PATCH 4/4] Adjust for newer OpenSSL version and URL --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2c6f46a2d6..e5c78e79a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,8 +56,8 @@ RUN curl -sL http://downloads.webmproject.org/releases/webp/libwebp-${LIBWEBP_VE RUN cd libwebp-${LIBWEBP_VER} && ./configure --prefix=/usr --enable-static --disable-shared && make all -j${NUM_CORES} && make install # OpenSSL -ENV OPENSSL_VER=1.0.2d -RUN curl -sL http://openssl.org/source/openssl-${OPENSSL_VER}.tar.gz | tar -xz +ENV OPENSSL_VER=1.0.2e +RUN curl -sL https://openssl.org/source/openssl-${OPENSSL_VER}.tar.gz | tar -xz RUN cd openssl-${OPENSSL_VER} && ./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib && make all && make install RUN apt-get install -y pkg-config