diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2021-03-10 19:36:14 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2021-03-10 19:36:14 +0300 |
commit | 38e34c10a67b5c861723b3f68e44647543b575b7 (patch) | |
tree | 2da9165daa636371821f740991e61672f74cfa80 | |
parent | 2749cf8efd4306b9b7cbc412e2d509ecc69c0969 (diff) |
Release cut 13.10
-rw-r--r-- | .gitlab-ci.yml | 8 | ||||
-rw-r--r-- | Dockerfile.13.10 | 22 |
2 files changed, 26 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe08dca0..54dcc8fe 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: 'master' - BRANCH_CHARTS: 'master' + BRANCH_EE: '13-10-stable-ee' + BRANCH_OMNIBUS: '13-10-stable' + BRANCH_RUNNER: '13-10-stable' + BRANCH_CHARTS: '4-10-stable' BUNDLE_PATH__SYSTEM: 'false' GIT_DEPTH: '20' ALPINE_VERSION: '3.12' diff --git a/Dockerfile.13.10 b/Dockerfile.13.10 new file mode 100644 index 00000000..409088eb --- /dev/null +++ b/Dockerfile.13.10 @@ -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=13.10 + +# Replace the versions to march the stable branches of the upstream projects +ARG BRANCH_EE=13-10-stable-ee +ARG BRANCH_OMNIBUS=13-10-stable +ARG BRANCH_RUNNER=13-10-stable +ARG BRANCH_CHARTS=4-10-stable + +# This image comes from the Dockerfile.builder.onbuild file +# https://gitlab.com/gitlab-org/gitlab-docs/blob/master/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/master/dockerfiles/Dockerfile.nginx.onbuild +# Copy the generated HTML files to a smaller image +FROM registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild |