tweaks required to get this to build... ruby now needs ruby to install ruby

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index e2d88e608978b763dcd70ab40890029d7e596abe..7ab59074790ca4db7c6d5020fe71ff256092c5ad 100644 (file)
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -64,10 +64,12 @@ RUN mkdir /jemalloc-new && cd /jemalloc-new &&\
       tar -xjf jemalloc-5.1.0.tar.bz2 && cd jemalloc-5.1.0 && ./configure --prefix=/usr --with-install-suffix=5.1.0 && make build_lib && make install_lib &&\
       cd / && rm -rf /jemalloc-new
 
-RUN echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
+RUN apt-get -y install ruby &&\
+    echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
     mkdir /src && cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\
     cd /src/ruby-build && ./install.sh &&\
-    cd / && rm -rf /src/ruby-build && (ruby-build 2.5.2 /usr/local)
+    cd / && rm -rf /src/ruby-build && (ruby-build 2.5.2 /usr/local) &&\
+    apt-get -y remove ruby
 
 RUN gem update --system
 

diff --git a/image/base/install-imagemagick b/image/base/install-imagemagick
index 01fff9660b721222a53cfbeb5e243468934e95ad..bb9d4835838c33a8aac7d8498ef21f51baaa52c2 100755 (executable)
--- a/image/base/install-imagemagick
+++ b/image/base/install-imagemagick
@@ -10,7 +10,7 @@ WDIR=/tmp/imagemagick
 mkdir -p $WDIR
 
 # Build and install libpng
-git clone -b v1.6.35 https://github.com/glennrp/libpng.git $WDIR/libpng
+git clone -b v1.6.34 https://github.com/glennrp/libpng.git $WDIR/libpng
 cd $WDIR/libpng
 ./autogen.sh
 ./configure --prefix=$PREFIX