From 0635a6a64497bc059ac2b5272728ddfd034b850c Mon Sep 17 00:00:00 2001 From: Nikhil Sharma Date: Wed, 11 Jan 2023 14:04:56 +0530 Subject: [PATCH] remove .* suffix after Dockerfile (#2685) Signed-off-by: Nikhl Sharma Signed-off-by: Nikhl Sharma --- .goreleaser.yml | 30 +++++++++---------- Makefile | 10 +++---- ...{Dockerfile.fission-builder => Dockerfile} | 0 ...{Dockerfile.fission-fetcher => Dockerfile} | 0 .../{Dockerfile.fission-bundle => Dockerfile} | 0 ...le.fission-preupgradechecks => Dockerfile} | 0 .../{Dockerfile.reporter => Dockerfile} | 0 test/test_utils.sh | 12 ++++---- 8 files changed, 26 insertions(+), 26 deletions(-) rename cmd/builder/{Dockerfile.fission-builder => Dockerfile} (100%) rename cmd/fetcher/{Dockerfile.fission-fetcher => Dockerfile} (100%) rename cmd/fission-bundle/{Dockerfile.fission-bundle => Dockerfile} (100%) rename cmd/preupgradechecks/{Dockerfile.fission-preupgradechecks => Dockerfile} (100%) rename cmd/reporter/{Dockerfile.reporter => Dockerfile} (100%) diff --git a/.goreleaser.yml b/.goreleaser.yml index 3987b54a..f4d9ac28 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -84,7 +84,7 @@ dockers: image_templates: - "fission/builder:latest-amd64" - "fission/builder:{{ .Tag }}-amd64" - dockerfile: cmd/builder/Dockerfile.fission-builder + dockerfile: cmd/builder/Dockerfile build_flag_templates: - "--platform=linux/amd64" - "--label=org.opencontainers.image.created={{.Date}}" @@ -96,28 +96,28 @@ dockers: image_templates: - "fission/fetcher:latest-amd64" - "fission/fetcher:{{ .Tag }}-amd64" - dockerfile: cmd/fetcher/Dockerfile.fission-fetcher + dockerfile: cmd/fetcher/Dockerfile - <<: *docker-amd64 ids: - fission-bundle image_templates: - "fission/fission-bundle:latest-amd64" - "fission/fission-bundle:{{ .Tag }}-amd64" - dockerfile: cmd/fission-bundle/Dockerfile.fission-bundle + dockerfile: cmd/fission-bundle/Dockerfile - <<: *docker-amd64 ids: - pre-upgrade-checks image_templates: - "fission/pre-upgrade-checks:latest-amd64" - "fission/pre-upgrade-checks:{{ .Tag }}-amd64" - dockerfile: cmd/preupgradechecks/Dockerfile.fission-preupgradechecks + dockerfile: cmd/preupgradechecks/Dockerfile - <<: *docker-amd64 ids: - reporter image_templates: - "fission/reporter:latest-amd64" - "fission/reporter:{{ .Tag }}-amd64" - dockerfile: cmd/reporter/Dockerfile.reporter + dockerfile: cmd/reporter/Dockerfile - &docker-arm64 use: buildx goos: linux @@ -127,7 +127,7 @@ dockers: image_templates: - "fission/builder:latest-arm64" - "fission/builder:{{ .Tag }}-arm64" - dockerfile: cmd/builder/Dockerfile.fission-builder + dockerfile: cmd/builder/Dockerfile build_flag_templates: - "--platform=linux/arm64" - "--label=org.opencontainers.image.created={{.Date}}" @@ -139,28 +139,28 @@ dockers: image_templates: - "fission/fetcher:latest-arm64" - "fission/fetcher:{{ .Tag }}-arm64" - dockerfile: cmd/fetcher/Dockerfile.fission-fetcher + dockerfile: cmd/fetcher/Dockerfile - <<: *docker-arm64 ids: - fission-bundle image_templates: - "fission/fission-bundle:latest-arm64" - "fission/fission-bundle:{{ .Tag }}-arm64" - dockerfile: cmd/fission-bundle/Dockerfile.fission-bundle + dockerfile: cmd/fission-bundle/Dockerfile - <<: *docker-arm64 ids: - pre-upgrade-checks image_templates: - "fission/pre-upgrade-checks:latest-arm64" - "fission/pre-upgrade-checks:{{ .Tag }}-arm64" - dockerfile: cmd/preupgradechecks/Dockerfile.fission-preupgradechecks + dockerfile: cmd/preupgradechecks/Dockerfile - <<: *docker-arm64 ids: - reporter image_templates: - "fission/reporter:latest-arm64" - "fission/reporter:{{ .Tag }}-arm64" - dockerfile: cmd/reporter/Dockerfile.reporter + dockerfile: cmd/reporter/Dockerfile - &docker-armv7 use: buildx goos: linux @@ -171,7 +171,7 @@ dockers: image_templates: - "fission/builder:latest-armv7" - "fission/builder:{{ .Tag }}-armv7" - dockerfile: cmd/builder/Dockerfile.fission-builder + dockerfile: cmd/builder/Dockerfile build_flag_templates: - "--platform=linux/arm/v7" - "--label=org.opencontainers.image.created={{.Date}}" @@ -183,28 +183,28 @@ dockers: image_templates: - "fission/fetcher:latest-armv7" - "fission/fetcher:{{ .Tag }}-armv7" - dockerfile: cmd/fetcher/Dockerfile.fission-fetcher + dockerfile: cmd/fetcher/Dockerfile - <<: *docker-armv7 ids: - fission-bundle image_templates: - "fission/fission-bundle:latest-armv7" - "fission/fission-bundle:{{ .Tag }}-armv7" - dockerfile: cmd/fission-bundle/Dockerfile.fission-bundle + dockerfile: cmd/fission-bundle/Dockerfile - <<: *docker-armv7 ids: - pre-upgrade-checks image_templates: - "fission/pre-upgrade-checks:latest-armv7" - "fission/pre-upgrade-checks:{{ .Tag }}-armv7" - dockerfile: cmd/preupgradechecks/Dockerfile.fission-preupgradechecks + dockerfile: cmd/preupgradechecks/Dockerfile - <<: *docker-armv7 ids: - reporter image_templates: - "fission/reporter:latest-armv7" - "fission/reporter:{{ .Tag }}-armv7" - dockerfile: cmd/reporter/Dockerfile.reporter + dockerfile: cmd/reporter/Dockerfile docker_manifests: - name_template: fission/builder:{{ .Tag }} image_templates: diff --git a/Makefile b/Makefile index ac6d5a7f..a54f29cb 100644 --- a/Makefile +++ b/Makefile @@ -112,11 +112,11 @@ all-generators: codegen generate-crds generate-swagger-doc generate-cli-docs gen skaffold-prebuild: @GOOS=linux GOARCH=amd64 GORELEASER_CURRENT_TAG=$(VERSION) goreleaser build --snapshot --rm-dist --single-target - @cp -v cmd/builder/Dockerfile.fission-builder dist/builder_linux_amd64_v1/Dockerfile - @cp -v cmd/fetcher/Dockerfile.fission-fetcher dist/fetcher_linux_amd64_v1/Dockerfile - @cp -v cmd/fission-bundle/Dockerfile.fission-bundle dist/fission-bundle_linux_amd64_v1/Dockerfile - @cp -v cmd/reporter/Dockerfile.reporter dist/reporter_linux_amd64_v1/Dockerfile - @cp -v cmd/preupgradechecks/Dockerfile.fission-preupgradechecks dist/pre-upgrade-checks_linux_amd64_v1/Dockerfile + @cp -v cmd/builder/Dockerfile dist/builder_linux_amd64_v1/Dockerfile + @cp -v cmd/fetcher/Dockerfile dist/fetcher_linux_amd64_v1/Dockerfile + @cp -v cmd/fission-bundle/Dockerfile dist/fission-bundle_linux_amd64_v1/Dockerfile + @cp -v cmd/reporter/Dockerfile dist/reporter_linux_amd64_v1/Dockerfile + @cp -v cmd/preupgradechecks/Dockerfile dist/pre-upgrade-checks_linux_amd64_v1/Dockerfile skaffold-deploy: skaffold-prebuild skaffold run -p $(SKAFFOLD_PROFILE) diff --git a/cmd/builder/Dockerfile.fission-builder b/cmd/builder/Dockerfile similarity index 100% rename from cmd/builder/Dockerfile.fission-builder rename to cmd/builder/Dockerfile diff --git a/cmd/fetcher/Dockerfile.fission-fetcher b/cmd/fetcher/Dockerfile similarity index 100% rename from cmd/fetcher/Dockerfile.fission-fetcher rename to cmd/fetcher/Dockerfile diff --git a/cmd/fission-bundle/Dockerfile.fission-bundle b/cmd/fission-bundle/Dockerfile similarity index 100% rename from cmd/fission-bundle/Dockerfile.fission-bundle rename to cmd/fission-bundle/Dockerfile diff --git a/cmd/preupgradechecks/Dockerfile.fission-preupgradechecks b/cmd/preupgradechecks/Dockerfile similarity index 100% rename from cmd/preupgradechecks/Dockerfile.fission-preupgradechecks rename to cmd/preupgradechecks/Dockerfile diff --git a/cmd/reporter/Dockerfile.reporter b/cmd/reporter/Dockerfile similarity index 100% rename from cmd/reporter/Dockerfile.reporter rename to cmd/reporter/Dockerfile diff --git a/test/test_utils.sh b/test/test_utils.sh index da69b66b..4478958a 100755 --- a/test/test_utils.sh +++ b/test/test_utils.sh @@ -74,9 +74,9 @@ build_and_push_go_mod_cache_image() { gcloud_login if ! gcloud docker -- pull $image_tag >/dev/null 2>&1 ; then - docker build -q -t $image_tag -f $ROOT/cmd/fission-bundle/Dockerfile.fission-bundle --target godep --build-arg GITCOMMIT=$(getGitCommit) --build-arg BUILDDATE=$(getDate) --build-arg BUILDVERSION=$(getVersion) . + docker build -q -t $image_tag -f $ROOT/cmd/fission-bundle/Dockerfile --target godep --build-arg GITCOMMIT=$(getGitCommit) --build-arg BUILDDATE=$(getDate) --build-arg BUILDVERSION=$(getVersion) . else - docker build -q -t $image_tag -f $ROOT/cmd/fission-bundle/Dockerfile.fission-bundle --cache-from ${image_tag} --target godep --build-arg GITCOMMIT=$(getGitCommit) --build-arg BUILDDATE=$(getDate) --build-arg BUILDVERSION=$(getVersion) . + docker build -q -t $image_tag -f $ROOT/cmd/fission-bundle/Dockerfile --cache-from ${image_tag} --target godep --build-arg GITCOMMIT=$(getGitCommit) --build-arg BUILDDATE=$(getDate) --build-arg BUILDVERSION=$(getVersion) . fi gcloud docker -- push $image_tag & @@ -88,7 +88,7 @@ build_and_push_pre_upgrade_check_image() { cache_image=$2 travis_fold_start build_and_push_pre_upgrade_check_image $image_tag - docker build -q -t $image_tag -f $ROOT/cmd/preupgradechecks/Dockerfile.fission-preupgradechecks --cache-from ${cache_image} --build-arg GITCOMMIT=$(getGitCommit) --build-arg BUILDDATE=$(getDate) --build-arg BUILDVERSION=$(getVersion) . + docker build -q -t $image_tag -f $ROOT/cmd/preupgradechecks/Dockerfile --cache-from ${cache_image} --build-arg GITCOMMIT=$(getGitCommit) --build-arg BUILDDATE=$(getDate) --build-arg BUILDVERSION=$(getVersion) . gcloud_login @@ -101,7 +101,7 @@ build_and_push_fission_bundle() { cache_image=$2 travis_fold_start build_and_push_fission_bundle $image_tag - docker build -q -t $image_tag -f $ROOT/cmd/fission-bundle/Dockerfile.fission-bundle --cache-from ${cache_image} --build-arg GITCOMMIT=$(getGitCommit) --build-arg BUILDDATE=$(getDate) --build-arg BUILDVERSION=$(getVersion) . + docker build -q -t $image_tag -f $ROOT/cmd/fission-bundle/Dockerfile --cache-from ${cache_image} --build-arg GITCOMMIT=$(getGitCommit) --build-arg BUILDDATE=$(getDate) --build-arg BUILDVERSION=$(getVersion) . gcloud_login @@ -114,7 +114,7 @@ build_and_push_fetcher() { cache_image=$2 travis_fold_start build_and_push_fetcher $image_tag - docker build -q -t $image_tag -f $ROOT/cmd/fetcher/Dockerfile.fission-fetcher --cache-from ${cache_image} --build-arg GITCOMMIT=$(getGitCommit) --build-arg BUILDDATE=$(getDate) --build-arg BUILDVERSION=$(getVersion) . + docker build -q -t $image_tag -f $ROOT/cmd/fetcher/Dockerfile --cache-from ${cache_image} --build-arg GITCOMMIT=$(getGitCommit) --build-arg BUILDDATE=$(getDate) --build-arg BUILDVERSION=$(getVersion) . gcloud_login @@ -128,7 +128,7 @@ build_and_push_builder() { cache_image=$2 travis_fold_start build_and_push_builder $image_tag - docker build -q -t $image_tag -f $ROOT/cmd/builder/Dockerfile.fission-builder --cache-from ${cache_image} --build-arg GITCOMMIT=$(getGitCommit) --build-arg BUILDDATE=$(getDate) --build-arg BUILDVERSION=$(getVersion) . + docker build -q -t $image_tag -f $ROOT/cmd/builder/Dockerfile --cache-from ${cache_image} --build-arg GITCOMMIT=$(getGitCommit) --build-arg BUILDDATE=$(getDate) --build-arg BUILDVERSION=$(getVersion) . gcloud_login