diff options
| author | Phillip Wells <pwells@gitlab.com> | 2022-12-22 00:20:46 +0300 |
|---|---|---|
| committer | Phillip Wells <pwells@gitlab.com> | 2022-12-22 00:20:46 +0300 |
| commit | 86f701fef85383435bf304471248dd4ad647fd38 (patch) | |
| tree | ca2de4d038cae35dbf16a17dc3997fb29f6cad6b | |
| parent | c01af312638db780ceb9358830a830fb09c33eb2 (diff) | |
| parent | 77a354b54b5b846c0fa7dedf41fc4a4ca93f513b (diff) | |
Merge branch '15.7-vars-backport' into '15.7'
Backport Alpine/Ruby versions to 15.7 branch
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3394
Merged-by: Phillip Wells <pwells@gitlab.com>
Approved-by: Phillip Wells <pwells@gitlab.com>
Co-authored-by: Sarah German <sgerman@gitlab.com>
Co-authored-by: Grzegorz Bizon <grzesiek.bizon@gmail.com>
| -rw-r--r-- | 15.7.Dockerfile | 6 | ||||
| -rw-r--r-- | dockerfiles/single.Dockerfile | 6 | ||||
| -rw-r--r-- | layouts/blueprints/table.erb | 6 |
3 files changed, 5 insertions, 13 deletions
diff --git a/15.7.Dockerfile b/15.7.Dockerfile index 99a80a64..6e37e5a7 100644 --- a/15.7.Dockerfile +++ b/15.7.Dockerfile @@ -19,11 +19,7 @@ RUN apk add --no-cache git \ #- Start of builder stage -# -# RUBY_VERSION and ALPINE_VERSION are defined in ../.gitlab-ci.yml -ARG RUBY_VERSION -ARG ALPINE_VERSION - -FROM ruby:${RUBY_VERSION}-alpine${ALPINE_VERSION} AS builder +FROM ruby:2.7.7-alpine3.16 AS builder # Copy minifier binary from the minifier stage COPY --from=minifier /minify /usr/local/bin/minify diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile index 6f578538..ec603f79 100644 --- a/dockerfiles/single.Dockerfile +++ b/dockerfiles/single.Dockerfile @@ -19,11 +19,7 @@ RUN apk add --no-cache git \ #- Start of builder stage -# -# RUBY_VERSION and ALPINE_VERSION are defined in ../.gitlab-ci.yml -ARG RUBY_VERSION -ARG ALPINE_VERSION - -FROM ruby:${RUBY_VERSION}-alpine${ALPINE_VERSION} AS builder +FROM ruby:2.7.7-alpine3.16 AS builder # Copy minifier binary from the minifier stage COPY --from=minifier /minify /usr/local/bin/minify diff --git a/layouts/blueprints/table.erb b/layouts/blueprints/table.erb index 9c87f75b..47968fba 100644 --- a/layouts/blueprints/table.erb +++ b/layouts/blueprints/table.erb @@ -31,13 +31,13 @@ </td> <% end %> <td> - <% b[:authors]&.each do |a| %> + <% Array(b[:authors]).each do |a| %> <code><%= author_link(a) %></code> <% end %> </td> <td> - <% if b[:coach] %> - <code><%= author_link(b[:coach]) %></code> + <% Array(b[:coach] || b[:coaches]).each do |c| %> + <code><%= author_link(c) %></code> <% end %> </td> <% if @summary %> |