diff --git a/.ci/containers/go-ruby-python/Dockerfile b/.ci/containers/go-ruby-python/Dockerfile index 401e0273eb79..7e139b4c6abb 100644 --- a/.ci/containers/go-ruby-python/Dockerfile +++ b/.ci/containers/go-ruby-python/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/magic-modules/go-ruby:1.11.5-2.6.0-v4 +FROM gcr.io/magic-modules/go-ruby:1.11.5-2.6.0-v5 # Install python & python libraries. RUN apt-get update diff --git a/.ci/containers/go-ruby/Gemfile b/.ci/containers/go-ruby/Gemfile index 3f1d14711c4f..a2c025535e29 100644 --- a/.ci/containers/go-ruby/Gemfile +++ b/.ci/containers/go-ruby/Gemfile @@ -7,7 +7,7 @@ gem 'rake' group :test do gem 'mocha', '~> 1.3.0' gem 'rspec' - gem 'rubocop', '~> 0.63.1' + gem 'rubocop', '>= 0.70.0' end group :pr_script do diff --git a/.ci/containers/go-ruby/Gemfile.lock b/.ci/containers/go-ruby/Gemfile.lock index 45fcbc12d68d..daa08f90072e 100644 --- a/.ci/containers/go-ruby/Gemfile.lock +++ b/.ci/containers/go-ruby/Gemfile.lock @@ -18,7 +18,7 @@ GEM multipart-post (>= 1.2, < 3) i18n (1.6.0) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.2) + jaro_winkler (1.5.4) metaclass (0.0.4) minitest (5.11.3) mocha (1.3.0) @@ -26,10 +26,9 @@ GEM multipart-post (2.0.0) octokit (4.13.0) sawyer (~> 0.8.0, >= 0.5.3) - parallel (1.12.1) - parser (2.6.0.0) + parallel (1.19.1) + parser (2.6.5.0) ast (~> 2.4.0) - powerpack (0.1.2) public_suffix (3.0.3) rainbow (3.0.0) rake (12.3.1) @@ -46,22 +45,21 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.63.1) + rubocop (0.70.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.4.0) - ruby-progressbar (1.10.0) + unicode-display_width (>= 1.4.0, < 1.7) + ruby-progressbar (1.10.1) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - unicode-display_width (1.4.1) + unicode-display_width (1.6.0) PLATFORMS ruby @@ -73,7 +71,7 @@ DEPENDENCIES octokit rake rspec - rubocop (~> 0.63.1) + rubocop (>= 0.70.0) BUNDLED WITH 1.17.2 diff --git a/.ci/containers/hub/Dockerfile b/.ci/containers/hub/Dockerfile index c8cf31252658..3d971fbd2c16 100644 --- a/.ci/containers/hub/Dockerfile +++ b/.ci/containers/hub/Dockerfile @@ -1,4 +1,4 @@ -from gcr.io/magic-modules/go-ruby-python:1.11.5-2.6.0-2.7-v4 +from gcr.io/magic-modules/go-ruby-python:1.11.5-2.6.0-2.7-v5 RUN apt-get update RUN apt-get install -y ca-certificates diff --git a/.ci/containers/terraform-gcloud-inspec/Dockerfile b/.ci/containers/terraform-gcloud-inspec/Dockerfile index 583e11a3b359..fda0fcde4a01 100644 --- a/.ci/containers/terraform-gcloud-inspec/Dockerfile +++ b/.ci/containers/terraform-gcloud-inspec/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/magic-modules/go-ruby-python:1.11.5-2.6.0-2.7-v4 +FROM gcr.io/magic-modules/go-ruby-python:1.11.5-2.6.0-2.7-v5 RUN apt-get install unzip RUN curl https://releases.hashicorp.com/terraform/0.12.16/terraform_0.12.16_linux_amd64.zip > terraform_0.12.16_linux_amd64.zip diff --git a/.ci/magic-modules/diff-terraform.yml b/.ci/magic-modules/diff-terraform.yml index 578f3eec1457..dd9252ada280 100644 --- a/.ci/magic-modules/diff-terraform.yml +++ b/.ci/magic-modules/diff-terraform.yml @@ -8,7 +8,7 @@ image_resource: type: docker-image source: repository: gcr.io/magic-modules/go-ruby-python - tag: '1.11.5-2.6.0-2.7-v4' + tag: '1.11.5-2.6.0-2.7-v5' inputs: - name: magic-modules-branched diff --git a/.ci/magic-modules/generate-ansible.yml b/.ci/magic-modules/generate-ansible.yml index f655f64311de..7c7154732a34 100644 --- a/.ci/magic-modules/generate-ansible.yml +++ b/.ci/magic-modules/generate-ansible.yml @@ -8,7 +8,7 @@ image_resource: type: docker-image source: repository: gcr.io/magic-modules/go-ruby-python - tag: '1.11.5-2.6.0-2.7-v4' + tag: '1.11.5-2.6.0-2.7-v5' inputs: - name: magic-modules-branched diff --git a/.ci/magic-modules/generate-inspec.yml b/.ci/magic-modules/generate-inspec.yml index fefbf6792775..4d52bab9eb08 100644 --- a/.ci/magic-modules/generate-inspec.yml +++ b/.ci/magic-modules/generate-inspec.yml @@ -8,7 +8,7 @@ image_resource: type: docker-image source: repository: gcr.io/magic-modules/go-ruby-python - tag: '1.11.5-2.6.0-2.7-v4' + tag: '1.11.5-2.6.0-2.7-v5' inputs: - name: magic-modules-branched diff --git a/.ci/magic-modules/generate-terraform.yml b/.ci/magic-modules/generate-terraform.yml index a8edd279c187..badee869daaf 100644 --- a/.ci/magic-modules/generate-terraform.yml +++ b/.ci/magic-modules/generate-terraform.yml @@ -8,7 +8,7 @@ image_resource: type: docker-image source: repository: gcr.io/magic-modules/go-ruby-python - tag: '1.11.5-2.6.0-2.7-v4' + tag: '1.11.5-2.6.0-2.7-v5' inputs: - name: magic-modules-branched