From fc69995865a97f77af965943232b32ba6a0cb6a7 Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Mon, 17 Apr 2017 11:45:48 -0300 Subject: [PATCH] Update to Ruby 2.4.1 --- image/base/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/image/base/Dockerfile b/image/base/Dockerfile index 6e587dd..66bfbb5 100644 --- a/image/base/Dockerfile +++ b/image/base/Dockerfile @@ -70,19 +70,18 @@ RUN mkdir /lockless && cd /lockless && curl -O https://locklessinc.com/downloads 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.3.3 /usr/local + cd / && rm -rf /src/ruby-build && ruby-build 2.4.1 /usr/local RUN gem install bundler &&\ - rm -rf /usr/local/share/ri/2.3.0/system &&\ + rm -rf /usr/local/share/ri/2.4.1/system &&\ cd / && git clone https://github.com/SamSaffron/pups.git ADD install-imagemagick /tmp/install-imagemagick RUN /tmp/install-imagemagick # Validate install -RUN ruby -e "v = %x(convert -version); ['png','tiff','jpeg','freetype'].each{ |f| ((STDERR.puts('no ' + f + ' support in imagemagick')); exit(-1)) unless v.include?(f)}" +RUN ruby -Eutf-8 -e "v = \`convert -version\`; %w{png tiff jpeg freetype}.each { |f| unless v.include?(f); STDERR.puts('no ' + f + ' support in imagemagick'); exit(-1); end }" -# ADD install-pngcrush /tmp/install-pngcrush RUN /tmp/install-pngcrush -- 2.25.1