From 93512617b70788c810ca98531f65b095ff062121 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Mon, 31 May 2021 06:42:37 +0000 Subject: Switch master branch occurrences to default branch (main) --- dockerfiles/Dockerfile.gitlab-docs-lint-html | 4 ++-- dockerfiles/Dockerfile.single | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'dockerfiles') diff --git a/dockerfiles/Dockerfile.gitlab-docs-lint-html b/dockerfiles/Dockerfile.gitlab-docs-lint-html index ee86c7de..8704f0cb 100644 --- a/dockerfiles/Dockerfile.gitlab-docs-lint-html +++ b/dockerfiles/Dockerfile.gitlab-docs-lint-html @@ -41,8 +41,8 @@ RUN echo 'gem: --no-document' >> /etc/gemrc # Set up needed environment variables that are called with --build-arg when # the Docker image is built (see .gitlab-ci.yml). ARG CI_COMMIT_REF_NAME -# If CI_COMMIT_REF_NAME is not set (local development), set it to master -ENV CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME:-master} +# If CI_COMMIT_REF_NAME is not set (local development), set it to main +ENV CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME:-main} WORKDIR /tmp diff --git a/dockerfiles/Dockerfile.single b/dockerfiles/Dockerfile.single index d55ea11d..90f24136 100644 --- a/dockerfiles/Dockerfile.single +++ b/dockerfiles/Dockerfile.single @@ -12,11 +12,11 @@ ARG BRANCH_RUNNER=X-Y-stable ARG BRANCH_CHARTS=W-Z-stable # This image comes from the Dockerfile.builder.onbuild file -# https://gitlab.com/gitlab-org/gitlab-docs/blob/master/dockerfiles/Dockerfile.builder.onbuild +# 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/master/dockerfiles/Dockerfile.nginx.onbuild +# 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 -- cgit v1.2.3