diff options
| author | Amy Qualls <aqualls@gitlab.com> | 2022-05-23 03:38:17 +0300 |
|---|---|---|
| committer | Amy Qualls <aqualls@gitlab.com> | 2022-05-23 03:38:17 +0300 |
| commit | 2308f4f957a45e3f2c8ba1d6b5f4b1b58cedf9d0 (patch) | |
| tree | da3e321ce4d1f1878ba7a0c59c3fd38b35275b31 | |
| parent | 7cb9ee4b1bc525f4589f3ea70690167a47e241f4 (diff) | |
| parent | a7a1dfc0c87cda474cef5516e3d638e12029f4f4 (diff) | |
Merge branch 'eread/rename-renamed-dockerfile' into 'main'
Name Dockerfile to match branch name
See merge request gitlab-org/gitlab-docs!2703
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | doc/releases.md | 4 | ||||
| -rw-r--r-- | main.Dockerfile (renamed from latest.Dockerfile) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ba30e66..9039f754 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -423,7 +423,7 @@ lint_dockerfiles: before_script: [] dependencies: [] script: - - hadolint latest.Dockerfile .gitpod.Dockerfile **/*.Dockerfile + - hadolint main.Dockerfile .gitpod.Dockerfile **/*.Dockerfile ############################################### # Review Apps # @@ -97,4 +97,4 @@ brew-bundle: test: setup brew-bundle @printf "\n$(INFO)INFO: Running all tests..$(INFO_END)\n" - @bundle exec rspec && yarn test && yarn eslint && yarn prettier && hadolint latest.Dockerfile .gitpod.Dockerfile **/*.Dockerfile && yamllint .gitlab-ci.yml content/_data + @bundle exec rspec && yarn test && yarn eslint && yarn prettier && hadolint main.Dockerfile .gitpod.Dockerfile **/*.Dockerfile && yamllint .gitlab-ci.yml content/_data diff --git a/doc/releases.md b/doc/releases.md index 70724762..c6442279 100644 --- a/doc/releases.md +++ b/doc/releases.md @@ -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 `latest.Dockerfile` by removing the oldest version, and then adding the newest version to the top of the list. +1. Edit `main.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 latest.Dockerfile + git add content/_data/versions.yaml main.Dockerfile git commit -m "Release 15.0" git push origin release-15-0 ``` diff --git a/latest.Dockerfile b/main.Dockerfile index a78ba557..a78ba557 100644 --- a/latest.Dockerfile +++ b/main.Dockerfile |