diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2022-06-08 05:04:53 +0300 |
|---|---|---|
| committer | Marcel Amirault <mamirault@gitlab.com> | 2022-06-08 05:04:53 +0300 |
| commit | 0d37a6fe5948324edcf918a121c1b22e046a8b89 (patch) | |
| tree | 3a7738dbd5b9d54c770c499ed5bbf8dacfb57909 | |
| parent | 381a4e18a44f8f4ebe4d967b6518c279ab081af9 (diff) | |
| parent | 23e1e0117903cb6a8b1b01802be1aed39678fc7e (diff) | |
Merge branch 'eread/make-base-deployments-manual' into 'main'
Make base deployments manual again
See merge request gitlab-org/gitlab-docs!2772
| -rw-r--r-- | .gitlab-ci.yml | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33899b98..56270961 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -590,10 +590,11 @@ image:docs-lint-markdown: DOCKERFILE: dockerfiles/gitlab-docs-lint-markdown.Dockerfile script: - docker build - --build-arg ALPINE_VERSION=${ALPINE_VERSION} - --build-arg VALE_VERSION=${VALE_VERSION} - --build-arg MARKDOWNLINT_VERSION=${MARKDOWNLINT_VERSION} - -t $IMAGE_NAME -f $DOCKERFILE . + --build-arg ALPINE_VERSION=${ALPINE_VERSION} + --build-arg VALE_VERSION=${VALE_VERSION} + --build-arg MARKDOWNLINT_VERSION=${MARKDOWNLINT_VERSION} + --tag $IMAGE_NAME + --file $DOCKERFILE . - docker push $IMAGE_NAME environment: name: registry/docs-lint-markdown @@ -632,9 +633,10 @@ image:docs-lint-html: DOCKERFILE: dockerfiles/gitlab-docs-lint-html.Dockerfile script: - docker build - --build-arg RUBY_VERSION=${RUBY_VERSION} - --build-arg ALPINE_VERSION=${ALPINE_VERSION} - -t $IMAGE_NAME -f $DOCKERFILE . + --build-arg RUBY_VERSION=${RUBY_VERSION} + --build-arg ALPINE_VERSION=${ALPINE_VERSION} + --tag $IMAGE_NAME + --file $DOCKERFILE . - docker push $IMAGE_NAME environment: name: registry/docs-lint-html @@ -662,17 +664,14 @@ test:image:docs-lint-html: # # Build and deploy the GitLab Docs base Docker image # -build-deploy:image:gitlab-docs-base: +image:gitlab-docs-base: extends: + - .rules_scheduled_manual - .docker_prepare stage: build-images variables: IMAGE_NAME: $CI_REGISTRY_IMAGE/base:alpine-$ALPINE_VERSION-ruby-$RUBY_VERSION-$CI_COMMIT_SHORT_SHA DOCKERFILE: dockerfiles/gitlab-docs-base.Dockerfile - rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - changes: - - $DOCKERFILE script: - docker build --build-arg ALPINE_VERSION=${ALPINE_VERSION} |