diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2023-01-30 14:52:28 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2023-01-30 14:52:28 +0300 |
| commit | 152b3adcc766d289f8a2e7b894d6ecad03a99922 (patch) | |
| tree | 33380836ca1e814a89c1dd55c309831325d44a05 | |
| parent | 4e4a6456a4d7c552537f4642960a75e69fc71ef4 (diff) | |
| parent | bb28ea4699a0dd1bed18376830e7610816897931 (diff) | |
Merge branch 'eread/make-ruby-3_0_5-the-only-ruby-for-project' into 'main'
Make Ruby 3.0.5 the only ruby for the project
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3487
Merged-by: Achilleas Pipinellis <axil@gitlab.com>
Co-authored-by: Evan Read <eread@gitlab.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitpod.Dockerfile | 6 | ||||
| -rw-r--r-- | .ruby-version | 2 | ||||
| -rw-r--r-- | .tool-versions | 2 | ||||
| -rw-r--r-- | dockerfiles/single.Dockerfile | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6eb4f7f..956126bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ variables: VALE_VERSION: '2.22.0' MARKDOWNLINT_VERSION: '0.32.2' # Version also set in package.json MARKDOWNLINT2_VERSION: '0.6.0' # Version also set in package.json - RUBY_VERSION: '2.7.7' + RUBY_VERSION: '3.0.5' # # workflow:rules to prevent duplicate pipelines when pushing to a branch with an open MR. diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 9caedc1b..4e80455e 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -1,11 +1,11 @@ -FROM gitpod/workspace-full:2022-10-02-19-08-52 +FROM gitpod/workspace-full:2023-01-16-03-31-28 USER gitpod -# Install Ruby version 2.7.6 and set it as default. +# Install Ruby version 3.0.5 and set it as default. # Required when the base Gitpod Docker image doesn't provide the version of Ruby we want. # For more information, see: https://www.gitpod.io/docs/languages/ruby. -RUN _ruby_version=ruby-2.7.6 \ +RUN _ruby_version=ruby-3.0.5 \ && printf "rvm_gems_path=/home/gitpod/.rvm\n" > ~/.rvmrc \ && bash -lc "rvm reinstall ${_ruby_version} && \ rvm use ${_ruby_version} --default" \ diff --git a/.ruby-version b/.ruby-version index 1f7da99d..eca690e7 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.7 +3.0.5 diff --git a/.tool-versions b/.tool-versions index 0d782bc9..1a217846 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,4 @@ -ruby 2.7.7 3.0.5 +ruby 3.0.5 nodejs 16.15.0 shellcheck 0.9.0 yarn 1.22.19 diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile index 0308c49e..dc9c2e31 100644 --- a/dockerfiles/single.Dockerfile +++ b/dockerfiles/single.Dockerfile @@ -19,7 +19,7 @@ RUN apk add --no-cache git \ #- Start of builder stage -# -FROM ruby:2.7.7-alpine3.16 AS builder +FROM ruby:3.0.5-alpine3.16 AS builder # Copy minifier binary from the minifier stage COPY --from=minifier /minify /usr/local/bin/minify |