Simplify Dockerfile by moving most of VIPS configure flags into prein…

…stall.sh.

Dockerfile

@@ -19,8 +19,8 @@ RUN install -D /etc/passwd /export/etc/passwd
 
 # Apt-get our dependencies, download, build, and install VIPS, and download and install Go.
 ADD preinstall.sh /app/src/github.com/die-net/fotomat/
-RUN DEBIAN_FRONTEND=noninteractive CFLAGS="-O2 -ftree-vectorize -msse2 -ffast-math -fPIC" \
-    VIPS_OPTIONS="--prefix=/usr --disable-gtk-doc-html --disable-pyvips8 --without-analyze --without-cfitsio --without-fftw --without-gsf --without-matio --without-openslide --without-orc --without-pangoft2 --without-magick --without-ppm --without-python --without-radiance --without-tiff --without-x" \
+RUN DEBIAN_FRONTEND=noninteractive CFLAGS="-O2 -ftree-vectorize -msse2 -ffast-math" \
+    VIPS_OPTIONS="--prefix=/usr" \
     /app/src/github.com/die-net/fotomat/preinstall.sh
 
 # Add the rest of our code.

preinstall.sh

@@ -90,9 +90,14 @@ else
   mkdir vips-$VIPS_VERSION
   curl -sSL "$url" | tar --strip-components=1 -C vips-$VIPS_VERSION -xzf -
   cd vips-$VIPS_VERSION
-  ./configure --disable-debug --disable-dependency-tracking --disable-static --without-orc --without-magick \
+  ./configure
+      --disable-debug --disable-dependency-tracking --disable-gtk-doc-html \
+      --disable-pyvips8 --disable-static --without-analyze --without-cfitsio \
+      --without-fftw --without-gsf --without-magick --without-matio \
+      --without-openslide --without-orc --without-pangoft2 --without-ppm \
+      --without-python --without-radiance --without-tiff --without-x \
       --with-OpenEXR --with-jpeg --with-lcms --with-libexif --with-giflib \
-      --with-tiff --with-libwebp --with-png ${VIPS_OPTIONS:-}
+      --with-libwebp --with-png ${VIPS_OPTIONS:-}
   make -j $( getconf _NPROCESSORS_ONLN 2> /dev/null || echo 1 )
   make install
   cd ..