From ae073319bf805570a0b701927007397b44fbba97 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 21 Mar 2019 10:46:05 +1100
Subject: [PATCH] Update dependencies

Including minor upgrades for redis,ruby,image magick, libpng

One notable thing here is that I removed the SHA check from redis

I am not against checking SHA but we need to explode if it fails and do
something far more consistent across our various downloads
---
 image/base/Dockerfile          | 4 ++--
 image/base/install-imagemagick | 4 ++--
 image/base/install-nginx       | 2 +-
 image/base/install-redis       | 4 +---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index c77c4d4..a668fc4 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -67,12 +67,12 @@ RUN mkdir /jemalloc-new && cd /jemalloc-new &&\
 RUN 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.6.1 /usr/local)
+    cd / && rm -rf /src/ruby-build && (ruby-build 2.6.2 /usr/local)
 
 RUN gem update --system
 
 RUN gem install bundler --force &&\
-    rm -rf /usr/local/share/ri/2.6.1/system &&\
+    rm -rf /usr/local/share/ri/2.6.2/system &&\
     cd / && git clone https://github.com/discourse/pups.git
 
 ADD install-redis /tmp/install-redis
diff --git a/image/base/install-imagemagick b/image/base/install-imagemagick
index 723d6c7..532fd44 100755
--- a/image/base/install-imagemagick
+++ b/image/base/install-imagemagick
@@ -10,14 +10,14 @@ WDIR=/tmp/imagemagick
 mkdir -p $WDIR
 
 # Build and install libpng
-git clone -b v1.6.34 https://github.com/glennrp/libpng.git $WDIR/libpng
+git clone -b v1.6.37 https://github.com/glennrp/libpng.git $WDIR/libpng
 cd $WDIR/libpng
 ./autogen.sh
 ./configure --prefix=$PREFIX
 make all && make install
 
 # Build and install ImageMagick
-wget -O $WDIR/ImageMagick.tar.gz "https://github.com/ImageMagick/ImageMagick/archive/7.0.8-23.tar.gz"
+wget -O $WDIR/ImageMagick.tar.gz "https://github.com/ImageMagick/ImageMagick/archive/7.0.8-34.tar.gz"
 IMDIR=$WDIR/$(tar tzf $WDIR/ImageMagick.tar.gz --wildcards "ImageMagick-*/configure" |cut -d/ -f1)
 tar zxf $WDIR/ImageMagick.tar.gz -C $WDIR
 cd $IMDIR
diff --git a/image/base/install-nginx b/image/base/install-nginx
index 9320174..50d1872 100755
--- a/image/base/install-nginx
+++ b/image/base/install-nginx
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-VERSION=1.15.8
+VERSION=1.15.9
 cd /tmp
 
 apt-get install -y autoconf
diff --git a/image/base/install-redis b/image/base/install-redis
index 0577bbb..d9b322c 100755
--- a/image/base/install-redis
+++ b/image/base/install-redis
@@ -1,13 +1,11 @@
 #!/bin/bash
 set -e
-REDIS_VERSION=5.0.3
-REDIS_DOWNLOAD_SHA=e290b4ddf817b26254a74d5d564095b11f9cd20d8f165459efa53eb63cd93e02
+REDIS_VERSION=5.0.4
 
 cd /tmp
 
 # Prepare Redis source.
 wget http://download.redis.io/releases/redis-$REDIS_VERSION.tar.gz
-echo "$REDIS_DOWNLOAD_SHA redis-$REDIS_VERSION.tar.gz" | sha256sum -c -
 tar zxf redis-$REDIS_VERSION.tar.gz
 cd redis-$REDIS_VERSION
 
-- 
2.25.1