diff options
| author | Evan Read <eread@gitlab.com> | 2023-03-13 13:31:58 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2023-03-13 13:31:58 +0300 |
| commit | 45925193a4406edcac61c4f697666abebe65ba79 (patch) | |
| tree | 0fba19ea17846aa4e75e4dc3a28b49120a5713ae /dockerfiles | |
| parent | a6d7a8e4c5be9a02e5e6f259083335dc7b48acb1 (diff) | |
Update to Ruby 3.2.1 and Alpine 3.17
Diffstat (limited to 'dockerfiles')
| -rw-r--r-- | dockerfiles/gitlab-docs-lint-markdown.Dockerfile | 2 | ||||
| -rw-r--r-- | dockerfiles/single.Dockerfile | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/dockerfiles/gitlab-docs-lint-markdown.Dockerfile b/dockerfiles/gitlab-docs-lint-markdown.Dockerfile index 233b809d..ab3f686c 100644 --- a/dockerfiles/gitlab-docs-lint-markdown.Dockerfile +++ b/dockerfiles/gitlab-docs-lint-markdown.Dockerfile @@ -48,5 +48,5 @@ RUN printf "\n\e[32mINFO: Installing markdownlint-cli %s..\e[39m\n" "${MARKDOWNL # Install markdownlint-cli2 RUN printf "\n\e[32mINFO: Installing markdownlint-cli2 %s..\e[39m\n" "${MARKDOWNLINT2_VERSION}" \ && yarn global add markdownlint-cli2@${MARKDOWNLINT2_VERSION} && yarn cache clean \ - && echo "markdownlint-cli2: $(markdownlint-cli2 --version)" \ + && markdownlint-cli2 | head -n 1 \ && printf "\n" diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile index bf3c55bf..383cd3f3 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:3.0.5-alpine3.16 AS builder +FROM ruby:3.2.1-alpine3.17 AS builder # Copy minifier binary from the minifier stage COPY --from=minifier /minify /usr/local/bin/minify @@ -72,11 +72,11 @@ RUN apk add --no-cache -U \ COPY . /source/ WORKDIR /source -RUN yarn install --frozen-lockfile \ - && yarn cache clean \ - && bundle config set --local deployment true \ - && bundle install \ - && bundle exec rake default \ +RUN yarn install --frozen-lockfile \ + && yarn cache clean \ + && bundle config set --local deployment true \ + && bundle install \ + && bundle exec rake default \ && bundle exec nanoc compile -VV RUN if [ "$SEARCH_BACKEND" = "lunr" ]; then make build-lunr-index; fi |