Skip to content

Commit

Permalink
Switch to Alpine Linux
Browse files Browse the repository at this point in the history
  • Loading branch information
gsfr committed May 23, 2017
1 parent 365e549 commit e74c8a7
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 13 deletions.
18 changes: 8 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
FROM buildpack-deps:xenial
FROM python:2.7-alpine

RUN apt-get update && apt-get install -y \
python-pip \
&& rm -rf /var/lib/apt/lists/* \
&& pip install --upgrade pip setuptools wheel
RUN apk add --no-cache build-base curl

COPY movescu.cc.patch /tmp
COPY dcmtk.patch /tmp
RUN cd /tmp \
&& curl http://support.dcmtk.org/redmine/attachments/download/87/dcmtk-3.6.1_20150924.tar.gz | tar xz \
&& cd dcmtk-* \
&& patch --strip 1 </tmp/movescu.cc.patch \
&& patch -p1 </tmp/dcmtk.patch \
&& ./configure \
&& make config-all ofstd-all oflog-all dcmdata-all dcmimgle-all dcmimage-all dcmjpeg-all dcmjpls-all dcmtls-all dcmnet-all \
&& make dcmnet-install dcmdata-install \
&& rm -rf /tmp/movescu.cc.patch /tmp/dcmtk-*
&& make dcmdata-install dcmnet-install \
&& rm -rf /tmp/dcmtk*

COPY . /src/reaper

ENV LC_ALL="C.UTF-8"
RUN pip install -e /src/reaper

CMD ["/bin/sh"]
17 changes: 14 additions & 3 deletions movescu.cc.patch → dcmtk.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
diff -Naur dcmtk-3.6.1_20150924/dcmnet/apps/movescu.cc dcmtk-3.6.1_20150924_patched/dcmnet/apps/movescu.cc
--- dcmtk-3.6.1_20150924/dcmnet/apps/movescu.cc 2015-09-24 05:27:10.000000000 -0700
+++ dcmtk-3.6.1_20150924_patched/dcmnet/apps/movescu.cc 2016-03-28 16:03:13.666855196 -0700
diff -Naur dcmtk-3.6.1_20150924/config/configure dcmtk-3.6.1_20150924.patch/config/configure
--- dcmtk-3.6.1_20150924/config/configure 2015-09-24 07:27:10.000000000 -0500
+++ dcmtk-3.6.1_20150924.patch/config/configure 2017-04-27 17:26:22.000000000 -0500
@@ -8551,7 +8551,6 @@
ac_fn_cxx_check_header_mongrel "$LINENO" "fenv.h" "ac_cv_header_fenv_h" "$ac_includes_default"
if test "x$ac_cv_header_fenv_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define HAVE_FENV_H 1
_ACEOF

fi
diff -Naur dcmtk-3.6.1_20150924/dcmnet/apps/movescu.cc dcmtk-3.6.1_20150924.patch/dcmnet/apps/movescu.cc
--- dcmtk-3.6.1_20150924/dcmnet/apps/movescu.cc 2015-09-24 07:27:10.000000000 -0500
+++ dcmtk-3.6.1_20150924.patch/dcmnet/apps/movescu.cc 2017-04-27 17:51:26.000000000 -0500
@@ -53,6 +53,12 @@

#define OFFIS_CONSOLE_APPLICATION "movescu"
Expand Down

0 comments on commit e74c8a7

Please sign in to comment.