Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove .* suffix after Dockerfile (#2685)

Browse Source 
Signed-off-by: Nikhl Sharma <nikhilsharma230303@gmail.com>

Signed-off-by: Nikhl Sharma <nikhilsharma230303@gmail.com>
This commit is contained in:
Nikhil Sharma
2023-01-11 14:04:56 +05:30
committed by GitHub
parent a9d55423ae
commit 0635a6a644
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.goreleaser.yml
+15 -15
View File
@@ -84,7 +84,7 @@ dockers:
image_templates: image_templates:
- "fission/builder:latest-amd64" - "fission/builder:latest-amd64"
- "fission/builder:{{ .Tag }}-amd64" - "fission/builder:{{ .Tag }}-amd64"
dockerfile: cmd/builder/Dockerfile.fission-builder dockerfile: cmd/builder/Dockerfile
build_flag_templates: build_flag_templates:
- "--platform=linux/amd64" - "--platform=linux/amd64"
- "--label=org.opencontainers.image.created={{.Date}}" - "--label=org.opencontainers.image.created={{.Date}}"
@@ -96,28 +96,28 @@ dockers:
image_templates: image_templates:
- "fission/fetcher:latest-amd64" - "fission/fetcher:latest-amd64"
- "fission/fetcher:{{ .Tag }}-amd64" - "fission/fetcher:{{ .Tag }}-amd64"
dockerfile: cmd/fetcher/Dockerfile.fission-fetcher dockerfile: cmd/fetcher/Dockerfile
- <<: *docker-amd64 - <<: *docker-amd64
ids: ids:
- fission-bundle - fission-bundle
image_templates: image_templates:
- "fission/fission-bundle:latest-amd64" - "fission/fission-bundle:latest-amd64"
- "fission/fission-bundle:{{ .Tag }}-amd64" - "fission/fission-bundle:{{ .Tag }}-amd64"
dockerfile: cmd/fission-bundle/Dockerfile.fission-bundle dockerfile: cmd/fission-bundle/Dockerfile
- <<: *docker-amd64 - <<: *docker-amd64
ids: ids:
- pre-upgrade-checks - pre-upgrade-checks
image_templates: image_templates:
- "fission/pre-upgrade-checks:latest-amd64" - "fission/pre-upgrade-checks:latest-amd64"
- "fission/pre-upgrade-checks:{{ .Tag }}-amd64" - "fission/pre-upgrade-checks:{{ .Tag }}-amd64"
dockerfile: cmd/preupgradechecks/Dockerfile.fission-preupgradechecks dockerfile: cmd/preupgradechecks/Dockerfile
- <<: *docker-amd64 - <<: *docker-amd64
ids: ids:
- reporter - reporter
image_templates: image_templates:
- "fission/reporter:latest-amd64" - "fission/reporter:latest-amd64"
- "fission/reporter:{{ .Tag }}-amd64" - "fission/reporter:{{ .Tag }}-amd64"
dockerfile: cmd/reporter/Dockerfile.reporter dockerfile: cmd/reporter/Dockerfile
- &docker-arm64 - &docker-arm64
use: buildx use: buildx
goos: linux goos: linux
@@ -127,7 +127,7 @@ dockers:
image_templates: image_templates:
- "fission/builder:latest-arm64" - "fission/builder:latest-arm64"
- "fission/builder:{{ .Tag }}-arm64" - "fission/builder:{{ .Tag }}-arm64"
dockerfile: cmd/builder/Dockerfile.fission-builder dockerfile: cmd/builder/Dockerfile
build_flag_templates: build_flag_templates:
- "--platform=linux/arm64" - "--platform=linux/arm64"
- "--label=org.opencontainers.image.created={{.Date}}" - "--label=org.opencontainers.image.created={{.Date}}"
@@ -139,28 +139,28 @@ dockers:
image_templates: image_templates:
- "fission/fetcher:latest-arm64" - "fission/fetcher:latest-arm64"
- "fission/fetcher:{{ .Tag }}-arm64" - "fission/fetcher:{{ .Tag }}-arm64"
dockerfile: cmd/fetcher/Dockerfile.fission-fetcher dockerfile: cmd/fetcher/Dockerfile
- <<: *docker-arm64 - <<: *docker-arm64
ids: ids:
- fission-bundle - fission-bundle
image_templates: image_templates:
- "fission/fission-bundle:latest-arm64" - "fission/fission-bundle:latest-arm64"
- "fission/fission-bundle:{{ .Tag }}-arm64" - "fission/fission-bundle:{{ .Tag }}-arm64"
dockerfile: cmd/fission-bundle/Dockerfile.fission-bundle dockerfile: cmd/fission-bundle/Dockerfile
- <<: *docker-arm64 - <<: *docker-arm64
ids: ids:
- pre-upgrade-checks - pre-upgrade-checks
image_templates: image_templates:
- "fission/pre-upgrade-checks:latest-arm64" - "fission/pre-upgrade-checks:latest-arm64"
- "fission/pre-upgrade-checks:{{ .Tag }}-arm64" - "fission/pre-upgrade-checks:{{ .Tag }}-arm64"
dockerfile: cmd/preupgradechecks/Dockerfile.fission-preupgradechecks dockerfile: cmd/preupgradechecks/Dockerfile
- <<: *docker-arm64 - <<: *docker-arm64
ids: ids:
- reporter - reporter
image_templates: image_templates:
- "fission/reporter:latest-arm64" - "fission/reporter:latest-arm64"
- "fission/reporter:{{ .Tag }}-arm64" - "fission/reporter:{{ .Tag }}-arm64"
dockerfile: cmd/reporter/Dockerfile.reporter dockerfile: cmd/reporter/Dockerfile
- &docker-armv7 - &docker-armv7
use: buildx use: buildx
goos: linux goos: linux
@@ -171,7 +171,7 @@ dockers:
image_templates: image_templates:
- "fission/builder:latest-armv7" - "fission/builder:latest-armv7"
- "fission/builder:{{ .Tag }}-armv7" - "fission/builder:{{ .Tag }}-armv7"
dockerfile: cmd/builder/Dockerfile.fission-builder dockerfile: cmd/builder/Dockerfile
build_flag_templates: build_flag_templates:
- "--platform=linux/arm/v7" - "--platform=linux/arm/v7"
- "--label=org.opencontainers.image.created={{.Date}}" - "--label=org.opencontainers.image.created={{.Date}}"
@@ -183,28 +183,28 @@ dockers:
image_templates: image_templates:
- "fission/fetcher:latest-armv7" - "fission/fetcher:latest-armv7"
- "fission/fetcher:{{ .Tag }}-armv7" - "fission/fetcher:{{ .Tag }}-armv7"
dockerfile: cmd/fetcher/Dockerfile.fission-fetcher dockerfile: cmd/fetcher/Dockerfile
- <<: *docker-armv7 - <<: *docker-armv7
ids: ids:
- fission-bundle - fission-bundle
image_templates: image_templates:
- "fission/fission-bundle:latest-armv7" - "fission/fission-bundle:latest-armv7"
- "fission/fission-bundle:{{ .Tag }}-armv7" - "fission/fission-bundle:{{ .Tag }}-armv7"
dockerfile: cmd/fission-bundle/Dockerfile.fission-bundle dockerfile: cmd/fission-bundle/Dockerfile
- <<: *docker-armv7 - <<: *docker-armv7
ids: ids:
- pre-upgrade-checks - pre-upgrade-checks
image_templates: image_templates:
- "fission/pre-upgrade-checks:latest-armv7" - "fission/pre-upgrade-checks:latest-armv7"
- "fission/pre-upgrade-checks:{{ .Tag }}-armv7" - "fission/pre-upgrade-checks:{{ .Tag }}-armv7"
dockerfile: cmd/preupgradechecks/Dockerfile.fission-preupgradechecks dockerfile: cmd/preupgradechecks/Dockerfile
- <<: *docker-armv7 - <<: *docker-armv7
ids: ids:
- reporter - reporter
image_templates: image_templates:
- "fission/reporter:latest-armv7" - "fission/reporter:latest-armv7"
- "fission/reporter:{{ .Tag }}-armv7" - "fission/reporter:{{ .Tag }}-armv7"
dockerfile: cmd/reporter/Dockerfile.reporter dockerfile: cmd/reporter/Dockerfile
docker_manifests: docker_manifests:
- name_template: fission/builder:{{ .Tag }} - name_template: fission/builder:{{ .Tag }}
image_templates: image_templates:
Makefile
+5 -5
View File
@@ -112,11 +112,11 @@ all-generators: codegen generate-crds generate-swagger-doc generate-cli-docs gen
skaffold-prebuild: skaffold-prebuild:
@GOOS=linux GOARCH=amd64 GORELEASER_CURRENT_TAG=$(VERSION) goreleaser build --snapshot --rm-dist --single-target @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/builder/Dockerfile dist/builder_linux_amd64_v1/Dockerfile
@cp -v cmd/fetcher/Dockerfile.fission-fetcher dist/fetcher_linux_amd64_v1/Dockerfile @cp -v cmd/fetcher/Dockerfile dist/fetcher_linux_amd64_v1/Dockerfile
@cp -v cmd/fission-bundle/Dockerfile.fission-bundle dist/fission-bundle_linux_amd64_v1/Dockerfile @cp -v cmd/fission-bundle/Dockerfile dist/fission-bundle_linux_amd64_v1/Dockerfile
@cp -v cmd/reporter/Dockerfile.reporter dist/reporter_linux_amd64_v1/Dockerfile @cp -v cmd/reporter/Dockerfile dist/reporter_linux_amd64_v1/Dockerfile
@cp -v cmd/preupgradechecks/Dockerfile.fission-preupgradechecks dist/pre-upgrade-checks_linux_amd64_v1/Dockerfile @cp -v cmd/preupgradechecks/Dockerfile dist/pre-upgrade-checks_linux_amd64_v1/Dockerfile
skaffold-deploy: skaffold-prebuild skaffold-deploy: skaffold-prebuild
skaffold run -p $(SKAFFOLD_PROFILE) skaffold run -p $(SKAFFOLD_PROFILE)
cmd/builder/Dockerfile.fission-builder → cmd/builder/Dockerfile
View File
cmd/fetcher/Dockerfile.fission-fetcher → cmd/fetcher/Dockerfile
View File
cmd/fission-bundle/Dockerfile.fission-bundle → cmd/fission-bundle/Dockerfile
View File
cmd/preupgradechecks/Dockerfile.fission-preupgradechecks → cmd/preupgradechecks/Dockerfile
View File
cmd/reporter/Dockerfile.reporter → cmd/reporter/Dockerfile
View File
test/test_utils.sh
+6 -6
View File
@@ -74,9 +74,9 @@ build_and_push_go_mod_cache_image() {
gcloud_login gcloud_login
if ! gcloud docker -- pull $image_tag >/dev/null 2>&1 ; then 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 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 fi
gcloud docker -- push $image_tag & gcloud docker -- push $image_tag &
@@ -88,7 +88,7 @@ build_and_push_pre_upgrade_check_image() {
cache_image=$2 cache_image=$2
travis_fold_start build_and_push_pre_upgrade_check_image $image_tag 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 gcloud_login
@@ -101,7 +101,7 @@ build_and_push_fission_bundle() {
cache_image=$2 cache_image=$2
travis_fold_start build_and_push_fission_bundle $image_tag 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 gcloud_login
@@ -114,7 +114,7 @@ build_and_push_fetcher() {
cache_image=$2 cache_image=$2
travis_fold_start build_and_push_fetcher $image_tag 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 gcloud_login
@@ -128,7 +128,7 @@ build_and_push_builder() {
cache_image=$2 cache_image=$2
travis_fold_start build_and_push_builder $image_tag 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 gcloud_login