diff options
| author | Evan Read <eread@gitlab.com> | 2022-05-10 17:24:18 +0300 |
|---|---|---|
| committer | Sarah German <sgerman@gitlab.com> | 2022-05-10 17:24:18 +0300 |
| commit | 1d6e353acc9657522a445863a63fc715d6d676ab (patch) | |
| tree | 55499cc1d33c40a075a2d57d8498b8a3ae5bbf54 /.gitlab-ci.yml | |
| parent | ff79701b2b6ea0d0d61857f80a64da05b62460c3 (diff) | |
Put Dockerfile file extensions at end of each file
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 22 |
1 files changed, 11 insertions, 11 deletions
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: |