diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2022-10-04 18:23:31 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2022-10-04 18:23:31 +0300 |
| commit | 9b2132e01bc0f9fa70d493aa772d4c5a0562d1e2 (patch) | |
| tree | 6e84876970ab0c9e1e68ec9a29f96df21b741a8e | |
| parent | 8793d49f6ecfefa9b66e63602cb19325d42dec95 (diff) | |
| parent | b48dd4d9bf3e8688cfe4f22d98985a6e0c8b8eb1 (diff) | |
Merge branch 'fix-gitpod' into 'main'
Use newer Gitpod base image. Fixes #1232
Closes #1232
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3149
Merged-by: Achilleas Pipinellis <axil@gitlab.com>
Approved-by: Lee Tickett <ltickett@gitlab.com>
Co-authored-by: Anatoli Babenia <anatoli@rainforce.org>
| -rw-r--r-- | .gitlab/ci/test.gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | .gitpod.Dockerfile | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index e1d8171f..3904f11b 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -184,7 +184,8 @@ lint_dockerfiles: needs: [] dependencies: [] script: - - hadolint latest.Dockerfile .gitpod.Dockerfile **/*.Dockerfile + - apk add make + - make hadolint-tests # # eslint-sast scans html too, so run in security stage after html files are generated diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 4a39ec38..9caedc1b 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -1,10 +1,13 @@ -FROM gitpod/workspace-full:2022-05-08-14-31-53 +FROM gitpod/workspace-full:2022-10-02-19-08-52 USER gitpod # Install Ruby version 2.7.6 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 echo "rvm_gems_path=/home/gitpod/.rvm" > ~/.rvmrc \ - && bash -lc "rvm install ruby-2.7.6 && rvm use ruby-2.7.6 --default" \ - && echo "rvm_gems_path=/workspace/.rvm" > ~/.rvmrc +RUN _ruby_version=ruby-2.7.6 \ + && printf "rvm_gems_path=/home/gitpod/.rvm\n" > ~/.rvmrc \ + && bash -lc "rvm reinstall ${_ruby_version} && \ + rvm use ${_ruby_version} --default" \ + && printf "rvm_gems_path=/workspace/.rvm" > ~/.rvmrc \ + && printf "{ rvm use \$(rvm current); } >/dev/null 2>&1\n" >> "$HOME/.bashrc.d/70-ruby" |