diff options
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 22 | ||||
| -rw-r--r-- | CODEOWNERS | 2 | ||||
| -rw-r--r-- | Rakefile | 6 | ||||
| -rw-r--r-- | doc/releases.md | 8 | ||||
| -rw-r--r-- | dockerfiles/README.md | 3 | ||||
| -rw-r--r-- | dockerfiles/archives.Dockerfile (renamed from dockerfiles/Dockerfile.archives) | 0 | ||||
| -rw-r--r-- | dockerfiles/bootstrap.Dockerfile (renamed from dockerfiles/Dockerfile.bootstrap) | 0 | ||||
| -rw-r--r-- | dockerfiles/builder.onbuild.Dockerfile (renamed from dockerfiles/Dockerfile.builder.onbuild) | 0 | ||||
| -rw-r--r-- | dockerfiles/gitlab-docs-base.Dockerfile (renamed from dockerfiles/Dockerfile.gitlab-docs-base) | 0 | ||||
| -rw-r--r-- | dockerfiles/gitlab-docs-lint-html.Dockerfile (renamed from dockerfiles/Dockerfile.gitlab-docs-lint-html) | 0 | ||||
| -rw-r--r-- | dockerfiles/gitlab-docs-lint-markdown.Dockerfile (renamed from dockerfiles/Dockerfile.gitlab-docs-lint-markdown) | 0 | ||||
| -rw-r--r-- | dockerfiles/nginx.onbuild.Dockerfile (renamed from dockerfiles/Dockerfile.nginx.onbuild) | 0 | ||||
| -rw-r--r-- | dockerfiles/single.Dockerfile (renamed from dockerfiles/Dockerfile.single) | 4 | ||||
| -rw-r--r-- | latest.Dockerfile (renamed from Dockerfile.main) | 0 |
15 files changed, 22 insertions, 24 deletions
diff --git a/.gitattributes b/.gitattributes index 7abc476a..6b99ebe5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,2 @@ *.html gitlab-language=erb /Rules gitlab-language=ruby -**Dockerfile.* gitlab-language=docker diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 421b75e0..fade1cbe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -421,8 +421,8 @@ lint_dockerfiles: before_script: [] dependencies: [] script: - - for file in Dockerfile.*; do hadolint $file; done - - for file in dockerfiles/Dockerfile.*; do hadolint $file; done + - for file in *.Dockerfile; do hadolint $file; done + - for file in dockerfiles/*.Dockerfile; do hadolint $file; done ############################################### # Review Apps # @@ -587,7 +587,7 @@ image:docs-lint-markdown: stage: build-images variables: IMAGE_NAME: $CI_REGISTRY_IMAGE/lint-markdown:alpine-$ALPINE_VERSION-vale-$VALE_VERSION-markdownlint-$MARKDOWNLINT_VERSION - DOCKERFILE: dockerfiles/Dockerfile.gitlab-docs-lint-markdown + DOCKERFILE: dockerfiles/gitlab-docs-lint-markdown.Dockerfile script: - docker build --build-arg ALPINE_VERSION=${ALPINE_VERSION} @@ -606,7 +606,7 @@ image:docs-lint-html: stage: build-images variables: IMAGE_NAME: $CI_REGISTRY_IMAGE/lint-html:alpine-$ALPINE_VERSION-ruby-$RUBY_VERSION-$CI_COMMIT_SHORT_SHA - DOCKERFILE: dockerfiles/Dockerfile.gitlab-docs-lint-html + DOCKERFILE: dockerfiles/gitlab-docs-lint-html.Dockerfile script: - docker build --build-arg RUBY_VERSION=${RUBY_VERSION} @@ -627,7 +627,7 @@ image:gitlab-docs-base: stage: build-images variables: IMAGE_NAME: $CI_REGISTRY_IMAGE:base - DOCKERFILE: dockerfiles/Dockerfile.gitlab-docs-base + DOCKERFILE: dockerfiles/gitlab-docs-base.Dockerfile script: - docker build -t $IMAGE_NAME -f $DOCKERFILE . - docker push $IMAGE_NAME @@ -645,7 +645,7 @@ image:bootstrap: stage: build-images variables: IMAGE_NAME: $CI_REGISTRY_IMAGE:bootstrap - DOCKERFILE: dockerfiles/Dockerfile.bootstrap + DOCKERFILE: dockerfiles/bootstrap.Dockerfile script: - docker build -t $IMAGE_NAME -f $DOCKERFILE . - docker push $IMAGE_NAME @@ -662,7 +662,7 @@ image:builder-onbuild: stage: build-images variables: IMAGE_NAME: $CI_REGISTRY_IMAGE:builder-onbuild - DOCKERFILE: dockerfiles/Dockerfile.builder.onbuild + DOCKERFILE: dockerfiles/builder.onbuild.Dockerfile script: - docker build -t $IMAGE_NAME -f $DOCKERFILE . - docker push $IMAGE_NAME @@ -680,7 +680,7 @@ image:nginx-onbuild: stage: build-images variables: IMAGE_NAME: $CI_REGISTRY_IMAGE:nginx-onbuild - DOCKERFILE: dockerfiles/Dockerfile.nginx.onbuild + DOCKERFILE: dockerfiles/nginx.onbuild.Dockerfile script: - docker build -t $IMAGE_NAME -f $DOCKERFILE . - docker push $IMAGE_NAME @@ -689,7 +689,7 @@ image:nginx-onbuild: # # Final Docker image containing a single version -# It is based on Dockerfile.single for each branch +# It is based on single.Dockerfile for each branch # image:docs-single: extends: @@ -701,7 +701,7 @@ image:docs-single: variables: NANOC_ENV: 'production' IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME - DOCKERFILE: Dockerfile.$CI_COMMIT_REF_NAME + DOCKERFILE: $CI_COMMIT_REF_NAME.Dockerfile environment: name: registry/$CI_COMMIT_REF_SLUG script: @@ -725,7 +725,7 @@ image:docs-latest: variables: NANOC_ENV: 'production' IMAGE_NAME: $CI_REGISTRY_IMAGE:latest - DOCKERFILE: Dockerfile.$CI_COMMIT_REF_NAME + DOCKERFILE: $CI_COMMIT_REF_NAME.Dockerfile environment: name: registry/latest script: @@ -6,7 +6,7 @@ content/assets @axil @derek-knox @ealcantara @jerasmus @oregand @dmishunov /bin/* @caalberts @godfat-gitlab @markglenfletcher @rymai @cwoolley-gitlab @vyaklushin @sarahgerman Gemfile* @axil @eread @marcel.amirault @sarahgerman -dockerfiles/* @axil @eread @marcel.amirault @sarahgerman +/**/*.Dockerfile @axil @eread @marcel.amirault @sarahgerman spec @cwoolley-gitlab @vyaklushin @doregan @mikegreiling @sarahgerman @@ -89,13 +89,13 @@ namespace :release do `git checkout -b #{version}` # Replace the branches variables in Dockerfile.X.Y - dockerfile = "#{source_dir}/Dockerfile.#{version}" + dockerfile = "#{source_dir}/#{version}.Dockerfile" if File.exist?(dockerfile) abort('rake aborted!') if ask("#{dockerfile} already exists. Do you want to overwrite?", %w[y n]) == 'n' end - content = File.read('dockerfiles/Dockerfile.single') + content = File.read('dockerfiles/single.Dockerfile') content.gsub!('X.Y', version) content.gsub!('X-Y', version.tr('.', '-')) content.gsub!('W-Z', chart_version(version).tr('.', '-')) @@ -117,7 +117,7 @@ namespace :release do end # Add and commit - `git add .gitlab-ci.yml Dockerfile.#{version}` + `git add .gitlab-ci.yml #{version}.Dockerfile` `git commit -m 'Release cut #{version}'` puts diff --git a/doc/releases.md b/doc/releases.md index 19f7c973..843df785 100644 --- a/doc/releases.md +++ b/doc/releases.md @@ -77,7 +77,7 @@ To create a stable branch of the `gitlab-docs` project and a Docker image for th ./bin/rake "release:single[13.9]" ``` - A branch for the release is created, a new `Dockerfile.13.9` is created, and `.gitlab-ci.yml` + A branch for the release is created, a new `13.9.Dockerfile` is created, and `.gitlab-ci.yml` has branches variables updated into a new branch. These files are automatically committed. 1. Push the newly created branch, but **don't create a merge request**. @@ -102,7 +102,7 @@ Prerequisite: 1. Build the image and run it. For example, for GitLab 13.9 documentation: ```shell - docker build -t docs:13.9 -f Dockerfile.13.9 . + docker build -t docs:13.9 -f 13.9.Dockerfile . docker run -it --rm -p 4000:4000 docs:13.9 ``` @@ -148,12 +148,12 @@ To create the release merge request for the release: - Move the oldest version in `online:` to the `offline:` section. There should now be three versions in `online:`. -1. Edit `Dockerfile.main` by removing the oldest version, and then adding the newest version to the top of the list. +1. Edit `latest.Dockerfile` by removing the oldest version, and then adding the newest version to the top of the list. 1. Commit and push to create the merge request. For example: ```shell - git add content/_data/versions.yaml Dockerfile.main + git add content/_data/versions.yaml latest.Dockerfile git commit -m "Release 13.9" git push origin release-13-9 ``` diff --git a/dockerfiles/README.md b/dockerfiles/README.md index 0db27808..f2b76b03 100644 --- a/dockerfiles/README.md +++ b/dockerfiles/README.md @@ -1,2 +1 @@ -For information on these Dockerfiles, see -<https://docs.gitlab.com/ee/development/documentation/site_architecture/release_process.html> +For information on these Dockerfiles, see ../doc/releases.md. diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/archives.Dockerfile index 961d0cfd..961d0cfd 100644 --- a/dockerfiles/Dockerfile.archives +++ b/dockerfiles/archives.Dockerfile diff --git a/dockerfiles/Dockerfile.bootstrap b/dockerfiles/bootstrap.Dockerfile index aba59541..aba59541 100644 --- a/dockerfiles/Dockerfile.bootstrap +++ b/dockerfiles/bootstrap.Dockerfile diff --git a/dockerfiles/Dockerfile.builder.onbuild b/dockerfiles/builder.onbuild.Dockerfile index 94faeb84..94faeb84 100644 --- a/dockerfiles/Dockerfile.builder.onbuild +++ b/dockerfiles/builder.onbuild.Dockerfile diff --git a/dockerfiles/Dockerfile.gitlab-docs-base b/dockerfiles/gitlab-docs-base.Dockerfile index 03009370..03009370 100644 --- a/dockerfiles/Dockerfile.gitlab-docs-base +++ b/dockerfiles/gitlab-docs-base.Dockerfile diff --git a/dockerfiles/Dockerfile.gitlab-docs-lint-html b/dockerfiles/gitlab-docs-lint-html.Dockerfile index 003146cd..003146cd 100644 --- a/dockerfiles/Dockerfile.gitlab-docs-lint-html +++ b/dockerfiles/gitlab-docs-lint-html.Dockerfile diff --git a/dockerfiles/Dockerfile.gitlab-docs-lint-markdown b/dockerfiles/gitlab-docs-lint-markdown.Dockerfile index 6d4caa2e..6d4caa2e 100644 --- a/dockerfiles/Dockerfile.gitlab-docs-lint-markdown +++ b/dockerfiles/gitlab-docs-lint-markdown.Dockerfile diff --git a/dockerfiles/Dockerfile.nginx.onbuild b/dockerfiles/nginx.onbuild.Dockerfile index 585f67c4..585f67c4 100644 --- a/dockerfiles/Dockerfile.nginx.onbuild +++ b/dockerfiles/nginx.onbuild.Dockerfile diff --git a/dockerfiles/Dockerfile.single b/dockerfiles/single.Dockerfile index 90f24136..020303ae 100644 --- a/dockerfiles/Dockerfile.single +++ b/dockerfiles/single.Dockerfile @@ -11,12 +11,12 @@ ARG BRANCH_OMNIBUS=X-Y-stable ARG BRANCH_RUNNER=X-Y-stable ARG BRANCH_CHARTS=W-Z-stable -# This image comes from the Dockerfile.builder.onbuild file +# This image comes from the builder.onbuild.Dockerfile 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 +# This image comes from the nginx.onbuild.Dockerfile 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 diff --git a/Dockerfile.main b/latest.Dockerfile index 55195aee..55195aee 100644 --- a/Dockerfile.main +++ b/latest.Dockerfile |