diff options
author | Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com> | 2021-11-18 15:00:57 +0300 |
---|---|---|
committer | Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com> | 2021-11-18 15:00:57 +0300 |
commit | 4706718b069c9e8531bc04cb79bb0ac394a9ab32 (patch) | |
tree | 345d5ae8c2cc9f4a417a6551c546477cd830eda6 | |
parent | 09c098e3ebe88f3a42d94b80430e8eb9e7583c40 (diff) |
Release cut 14.5
-rw-r--r-- | .gitlab-ci.yml | 8 | ||||
-rw-r--r-- | Dockerfile.14.5 | 22 |
2 files changed, 26 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc471428..b2c3a1db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,10 +28,10 @@ stages: # Pick the remote branch, by default master (see the Rakefile for more info) # variables: - BRANCH_EE: 'master' - BRANCH_OMNIBUS: 'master' - BRANCH_RUNNER: 'main' - BRANCH_CHARTS: 'master' + BRANCH_EE: '14-5-stable-ee' + BRANCH_OMNIBUS: '14-5-stable' + BRANCH_RUNNER: '14-5-stable' + BRANCH_CHARTS: '5-5-stable' BUNDLE_PATH__SYSTEM: 'false' GIT_DEPTH: '20' ALPINE_VERSION: '3.14' diff --git a/Dockerfile.14.5 b/Dockerfile.14.5 new file mode 100644 index 00000000..1a9a7609 --- /dev/null +++ b/Dockerfile.14.5 @@ -0,0 +1,22 @@ +# +# Copy this Dockerfile to the root of each branch you want to create an archive +# + +# Set to the version for this archive (must match the branch name) +ARG VER=14.5 + +# Replace the versions to march the stable branches of the upstream projects +ARG BRANCH_EE=14-5-stable-ee +ARG BRANCH_OMNIBUS=14-5-stable +ARG BRANCH_RUNNER=14-5-stable +ARG BRANCH_CHARTS=5-5-stable + +# This image comes from the Dockerfile.builder.onbuild file +# https://gitlab.com/gitlab-org/gitlab-docs/blob/main/dockerfiles/Dockerfile.builder.onbuild +# Build the website +FROM registry.gitlab.com/gitlab-org/gitlab-docs:builder-onbuild AS builder + +# This image comes from the Dockerfile.nginx.onbuild file +# https://gitlab.com/gitlab-org/gitlab-docs/blob/main/dockerfiles/Dockerfile.nginx.onbuild +# Copy the generated HTML files to a smaller image +FROM registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild |