From f6d8f8aded7ffcb91b8bd6f40b69583f704b26c8 Mon Sep 17 00:00:00 2001 From: Bret Comnes Date: Thu, 14 Mar 2019 11:05:53 -0700 Subject: [PATCH] Update to ruby 2.6.2 --- Dockerfile | 8 ++++---- included_software.md | 2 +- run-build.sh | 2 +- test-tools/test-build.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7c8e29bf..deb9609a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -176,7 +176,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libicu-dev \ libcurl3 \ liblttng-ust0 \ - libkrb5-3 \ + libkrb5-3 \ && \ /var/lib/dpkg/info/ca-certificates-java.postinst configure && \ apt-get clean && \ @@ -247,8 +247,8 @@ ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/s # Match this set latest Stable releases we can support on https://www.ruby-lang.org/en/downloads/ RUN /bin/bash -c "source ~/.rvm/scripts/rvm && \ - rvm install 2.6.1 && rvm use 2.6.1 && gem install bundler && \ - rvm use 2.6.1 --default && rvm cleanup all" + rvm install 2.6.2 && rvm use 2.6.2 && gem install bundler && \ + rvm use 2.6.2 --default && rvm cleanup all" ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin USER root @@ -412,7 +412,7 @@ RUN gimme ################################################################################ USER buildbot WORKDIR /tmp -RUN wget https://dot.net/v1/dotnet-install.sh +RUN wget https://dot.net/v1/dotnet-install.sh RUN chmod u+x /tmp/dotnet-install.sh RUN /tmp/dotnet-install.sh -c Current ENV PATH "$PATH:/opt/buildhome/.dotnet/tools" diff --git a/included_software.md b/included_software.md index d9eace26..eb0476e9 100644 --- a/included_software.md +++ b/included_software.md @@ -9,7 +9,7 @@ For instructions on how to run this image locally to test your build, please see The specific patch versions included will depend on when the image was last built (except Ruby). It is highly suggested you depend only on minor versions, so that we can ensure the language has the latest updates (especially if security related). * Ruby - `RUBY_VERSION`, `.ruby-version` - * 2.6.1 (default) + * 2.6.2 (default) * Any version that `rvm` can install. * Node.js - `NODE_VERSION`, `.nvmrc`, `.node-version` * 10 (default) diff --git a/run-build.sh b/run-build.sh index 45c7902a..28503f49 100755 --- a/run-build.sh +++ b/run-build.sh @@ -19,7 +19,7 @@ fi cd $NETLIFY_REPO_DIR : ${NODE_VERSION="10"} -: ${RUBY_VERSION="2.6.1"} +: ${RUBY_VERSION="2.6.2"} : ${YARN_VERSION="1.13.0"} : ${PHP_VERSION="5.6"} : ${GO_VERSION="1.12"} diff --git a/test-tools/test-build.sh b/test-tools/test-build.sh index 3c8b3f67..bd452942 100755 --- a/test-tools/test-build.sh +++ b/test-tools/test-build.sh @@ -17,7 +17,7 @@ set -e : ${NETLIFY_IMAGE="netlify/build"} : ${NODE_VERSION="10"} -: ${RUBY_VERSION="2.6.1"} +: ${RUBY_VERSION="2.6.2"} : ${YARN_VERSION="1.13.0"} : ${NPM_VERSION=""} : ${HUGO_VERSION="0.54"}