diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2022-06-09 09:47:39 +0300 |
|---|---|---|
| committer | Marcel Amirault <mamirault@gitlab.com> | 2022-06-09 09:47:39 +0300 |
| commit | 0bd38345492d4a66463e6ee630d90f09d1a9a8d5 (patch) | |
| tree | 3b5c8bb7b5a5cf2bbf8261ab06362b7330799349 | |
| parent | 94853638d4f4861af9d83cdcfa4dfb4274b16591 (diff) | |
| parent | 64e22d145e7267ba23827c65c0edc6429670d602 (diff) | |
Merge branch 'eread/update-dependencies-in-docker-images' into 'main'
Update to latest Ruby 2.7.x and Alpine Linux in Docker images
See merge request gitlab-org/gitlab-docs!2783
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | dockerfiles/gitlab-docs-base.Dockerfile | 2 | ||||
| -rw-r--r-- | dockerfiles/gitlab-docs-lint-html.Dockerfile | 2 | ||||
| -rw-r--r-- | dockerfiles/single.Dockerfile | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 56270961..234a9f07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,10 +43,10 @@ variables: BRANCH_OPERATOR: 'master' BUNDLE_PATH__SYSTEM: 'false' GIT_DEPTH: '20' - ALPINE_VERSION: '3.15' - VALE_VERSION: '2.16.1' + ALPINE_VERSION: '3.16' + VALE_VERSION: '2.17.0' MARKDOWNLINT_VERSION: '0.31.1' - RUBY_VERSION: '2.7.5' + RUBY_VERSION: '2.7.6' # # Retry a job automatically if it fails (2 times) diff --git a/dockerfiles/gitlab-docs-base.Dockerfile b/dockerfiles/gitlab-docs-base.Dockerfile index 81d27f16..c756a4a4 100644 --- a/dockerfiles/gitlab-docs-base.Dockerfile +++ b/dockerfiles/gitlab-docs-base.Dockerfile @@ -30,7 +30,7 @@ RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apk add --no-cac xz-dev \ yarn \ && echo 'gem: --no-document' >> /etc/gemrc \ - && gem update --silent --system 3.3.13 \ + && gem update --silent --system \ && printf "\n\e[32mINFO: Dependency versions:\e[39m\n" \ && echo "Ruby: $(ruby --version)" \ && echo "RubyGems: $(gem --version)" \ diff --git a/dockerfiles/gitlab-docs-lint-html.Dockerfile b/dockerfiles/gitlab-docs-lint-html.Dockerfile index 5e722407..cc8745c8 100644 --- a/dockerfiles/gitlab-docs-lint-html.Dockerfile +++ b/dockerfiles/gitlab-docs-lint-html.Dockerfile @@ -28,7 +28,7 @@ RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apk add --no-cac xz-dev \ yarn \ && echo 'gem: --no-document' >> /etc/gemrc \ - && gem update --system 3.3.13 \ + && gem update --system \ && printf "\n\e[32mINFO: Dependency versions:\e[39m\n" \ && echo "Ruby: $(ruby --version)" \ && echo "RubyGems: $(gem --version)" \ diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile index 4794e66c..6aa88c17 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.5-alpine3.15 AS builder +FROM ruby:2.7.6-alpine3.16 AS builder # Copy minifier binary from the minifier stage COPY --from=minifier /minify /usr/local/bin/minify @@ -64,7 +64,7 @@ RUN apk add --no-cache -U \ xz-dev \ yarn \ && echo 'gem: --no-document' >> /etc/gemrc \ - && gem update --silent --system 3.3.13 \ + && gem update --silent --system \ && printf "\n\e[32mINFO: Dependency versions:\e[39m\n" \ && echo "Ruby: $(ruby --version)" \ && echo "RubyGems: $(gem --version)" \ |