From 95a43b551047db097c3c7514477e8ccdd517cf03 Mon Sep 17 00:00:00 2001
From: Gunnar Schaefer <gsfr@flywheel.io>
Date: Mon, 22 May 2017 16:52:08 -0700
Subject: [PATCH 1/3] Switch to Alpine Linux

---
 Dockerfile                      | 18 ++++++++----------
 movescu.cc.patch => dcmtk.patch | 17 ++++++++++++++---
 2 files changed, 22 insertions(+), 13 deletions(-)
 rename movescu.cc.patch => dcmtk.patch (88%)

diff --git a/Dockerfile b/Dockerfile
index 9d81d5b..a683f91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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"]
diff --git a/movescu.cc.patch b/dcmtk.patch
similarity index 88%
rename from movescu.cc.patch
rename to dcmtk.patch
index 2924ede..c12a4d8 100644
--- a/movescu.cc.patch
+++ b/dcmtk.patch
@@ -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"

From b0360b389f8ece3f25ae6d25d7a359f4c17ecbc9 Mon Sep 17 00:00:00 2001
From: Gunnar Schaefer <gsfr@flywheel.io>
Date: Tue, 23 May 2017 08:17:12 -0700
Subject: [PATCH 2/3] Multistage Docker build

---
 Dockerfile | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a683f91..5da17b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,27 @@
-FROM python:2.7-alpine
+FROM alpine as build
 
 RUN apk add --no-cache build-base curl
 
-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 -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 dcmdata-install dcmnet-install \
- && rm -rf /tmp/dcmtk*
+WORKDIR dcmtk
+RUN curl http://support.dcmtk.org/redmine/attachments/download/87/dcmtk-3.6.1_20150924.tar.gz | tar xz --strip-components 1
+
+COPY dcmtk.patch .
+RUN patch -p1 <dcmtk.patch
+
+RUN ./configure
+RUN make config-all ofstd-all oflog-all dcmdata-all dcmimgle-all dcmimage-all dcmjpeg-all dcmjpls-all dcmtls-all dcmnet-all
+RUN make dcmdata-install dcmnet-install
+
+
+
+FROM python:2.7-alpine
+
+RUN apk add --no-cache libstdc++
+
+COPY --from=build /usr/local/bin                /usr/local/bin
+COPY --from=build /usr/local/etc/dcmtk          /usr/local/etc/dcmtk
+COPY --from=build /usr/local/share/dcmtk        /usr/local/share/dcmtk
+COPY --from=build /usr/local/share/doc/dcmtk    /usr/local/share/doc/dcmtk
 
 COPY . /src/reaper
 

From 63ce7038aa04ece042a2266a021a0d423426ac7c Mon Sep 17 00:00:00 2001
From: Gunnar Schaefer <gsfr@flywheel.io>
Date: Tue, 30 May 2017 15:58:06 -0700
Subject: [PATCH 3/3] Update to latest (patched) dcmtk

---
 Dockerfile  |  5 +++--
 dcmtk.patch | 25 +++++++------------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5da17b7..d8ce95c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,10 @@
 FROM alpine as build
 
-RUN apk add --no-cache build-base curl
+RUN apk add --no-cache build-base git
 
+RUN git clone git://git.dcmtk.org/dcmtk.git
 WORKDIR dcmtk
-RUN curl http://support.dcmtk.org/redmine/attachments/download/87/dcmtk-3.6.1_20150924.tar.gz | tar xz --strip-components 1
+RUN git checkout -qf 6c5329a82728bee2c7b6c7a05dbff192a2418d87
 
 COPY dcmtk.patch .
 RUN patch -p1 <dcmtk.patch
diff --git a/dcmtk.patch b/dcmtk.patch
index c12a4d8..c766afc 100644
--- a/dcmtk.patch
+++ b/dcmtk.patch
@@ -1,18 +1,7 @@
-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 @@
+diff -Naur dcmtk/dcmnet/apps/movescu.cc dcmtk.patched/dcmnet/apps/movescu.cc
+--- dcmtk/dcmnet/apps/movescu.cc	2017-05-30 14:10:19.000000000 -0700
++++ dcmtk.patched/dcmnet/apps/movescu.cc	2017-05-30 14:09:29.000000000 -0700
+@@ -48,6 +48,12 @@
  
  #define OFFIS_CONSOLE_APPLICATION "movescu"
  
@@ -25,9 +14,9 @@ diff -Naur dcmtk-3.6.1_20150924/dcmnet/apps/movescu.cc dcmtk-3.6.1_20150924.patc
  static OFLogger movescuLogger = OFLog::getLogger("dcmtk.apps." OFFIS_CONSOLE_APPLICATION);
  
  static char rcsid[] = "$dcmtk: " OFFIS_CONSOLE_APPLICATION " v"
-@@ -1170,6 +1176,9 @@
+@@ -1248,6 +1254,9 @@
                  (*assoc)->params,
-                 dcmAllStorageSOPClassUIDs, numberOfAllDcmStorageSOPClassUIDs,
+                 dcmAllStorageSOPClassUIDs, numberOfDcmAllStorageSOPClassUIDs,
                  transferSyntaxes, numTransferSyntaxes);
 +            /* accept everything not known not to be a storage SOP class */
 +            cond = acceptUnknownContextsWithPreferredTransferSyntaxes(
@@ -35,7 +24,7 @@ diff -Naur dcmtk-3.6.1_20150924/dcmnet/apps/movescu.cc dcmtk-3.6.1_20150924.patc
          }
      }
      if (cond.good())
-@@ -1189,6 +1198,141 @@
+@@ -1267,6 +1276,141 @@
      return cond;
  }