Migrate dockerfile to release directory (#1566)

* Migrate dockerfile to release directory * Update releasing docs
kptdev · Mar 18, 2021 · f56f41f · f56f41f
1 parent f2b3b6d
commit f56f41f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -73,7 +73,10 @@ vet:
 	go vet ./...
 
 docker:
-	docker build .
+	docker build -f release/Dockerfile .
+
+docker-gcloud:
+	docker build -f release/gcloud/Dockerfile .
 
 lintdocs:
 	(cd site && npm run lint-fix)

diff --git a/Dockerfile → release/Dockerfile b/Dockerfile → release/Dockerfile
diff --git a/release/README.md b/release/README.md
@@ -10,7 +10,7 @@ To cut a new kpt release perform the following:
   - Within kustomize: [cmd/config](https://github.com/kubernetes-sigs/kustomize/blob/master/releasing)
   - Update `go.mod` file with correct versions of `cli-utils`, `kyaml`, and `cmd/config`
   - Update the pinned base image versions in the kpt Dockerfiles
-  ([Dockerfile](./Dockerfile) and [release/gcloud/Dockerfile](./release/gcloud/Dockerfile))
+  ([release/Dockerfile](./Dockerfile) and [release/gcloud/Dockerfile](./gcloud/Dockerfile))
   - Run `make all` (which should update `go.sum` and run `go mod tidy`)
   - Create a `kpt` PR with previous `go.mod` and `go.sum` changes, and submit. [Example PR](https://github.com/GoogleContainerTools/kpt/pull/594)
 - Fetch the latest master changes to a clean branch

diff --git a/release/tag/cloudbuild.yaml b/release/tag/cloudbuild.yaml
@@ -142,7 +142,7 @@ steps:
   ## kpt image
   - name: 'gcr.io/cloud-builders/docker'
     dir: 'kpt'
-    args: [ 'build', '-t', 'gcr.io/$PROJECT_ID/kpt:${TAG_NAME}', '.', '--build-arg', 'KPT_VERSION=${_VERSION}']
+    args: [ 'build', '-t', 'gcr.io/$PROJECT_ID/kpt:${TAG_NAME}', '-f', 'release/Dockerfile', '.', '--build-arg', 'KPT_VERSION=${_VERSION}']
 
   - name: 'gcr.io/cloud-builders/docker'
     dir: 'kpt'