Skip to content

Dockerfile improvements #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
djmaze wants to merge 4 commits into
base: master
Choose a base branch
from
+5 −5
Open

Dockerfile improvements #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c86972e
Fix Dockerfile to install a newer OpenSSL version
djmaze Aug 23, 2015
355ef22
Use code from current checkout in Docker build
djmaze Aug 23, 2015
232b8e2
Compile project during the Docker build instead of during run
djmaze Aug 23, 2015
7e49a1b
Adjust for newer OpenSSL version and URL
djmaze Jan 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions deploy/Dockerfile → Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2a
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
Expand Down Expand Up @@ -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

CMD cd phantomjs && git checkout ${PHANTOMJS_TAG} && ./build.sh --confirm && cp bin/phantomjs /output/.
COPY . phantomjs

RUN cd phantomjs && git checkout ${PHANTOMJS_TAG} && ./build.sh --confirm
CMD cp phantomjs/bin/phantomjs /output/.