From 800fa28f8313194963f6e8327e80148faf9948f7 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Tue, 7 Jan 2020 10:03:27 -0600 Subject: [PATCH] Revert Ruby 2.7.0 upgrade for now. --- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 8 ++++---- docker_configs/api.Dockerfile | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ruby-version b/.ruby-version index 24ba9a38d..57cf282eb 100755 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.0 +2.6.5 diff --git a/Gemfile b/Gemfile index dd86b9bb1..5f12a8c52 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" -ruby "~> 2.7.0" +ruby "~> 2.6.5" gem "rails" gem "active_model_serializers" diff --git a/Gemfile.lock b/Gemfile.lock index bace375ea..51c95b965 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,7 +119,7 @@ GEM railties (>= 3.2, < 6.1) globalid (0.4.2) activesupport (>= 4.2.0) - google-api-client (0.36.3) + google-api-client (0.36.4) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) @@ -131,7 +131,7 @@ GEM google-cloud-env (~> 1.0) google-cloud-env (1.3.0) faraday (~> 0.11) - google-cloud-storage (1.25.0) + google-cloud-storage (1.25.1) addressable (~> 2.5) digest-crc (~> 0.4) google-api-client (~> 0.33) @@ -184,7 +184,7 @@ GEM method_source (~> 0.9.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.2) + public_suffix (4.0.3) rabbitmq_http_api_client (1.12.0) faraday (~> 0.15.4) faraday_middleware (~> 0.13.0) @@ -341,7 +341,7 @@ DEPENDENCIES valid_url RUBY VERSION - ruby 2.7.0p0 + ruby 2.6.5p114 BUNDLED WITH 2.1.3 diff --git a/docker_configs/api.Dockerfile b/docker_configs/api.Dockerfile index 0c0f0327e..067bb8c10 100644 --- a/docker_configs/api.Dockerfile +++ b/docker_configs/api.Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.0 +FROM ruby:2.6.5 RUN wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add - && \ sh -c 'VERSION_CODENAME=stretch; . /etc/os-release; echo "deb http://apt.postgresql.org/pub/repos/apt/ $VERSION_CODENAME-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \ apt-get update -qq && apt-get install -y build-essential libpq-dev postgresql postgresql-contrib && \