From b544b37174337642c8247023b23de1a2d750d82c Mon Sep 17 00:00:00 2001 From: yuchunyu97 Date: Thu, 9 Jul 2020 14:59:25 +0800 Subject: [PATCH 1/4] docs: fix the building part in CONTRIBUTING.md --- CONTRIBUTING.md | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6380666f87..58c2291fd4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,8 +75,8 @@ go run -tags gcp ./cli/ingress-controller/ \ ## Building Build is performed via Makefile. Depending on your -requirements you can build a raw server binary, a local container image, -or push an image to a remote repository. +requirements you can build a raw server binary +or a local container image. ### Build a raw server binary @@ -87,7 +87,7 @@ $ make build ### Build a local container image ```console -$ TAG=DEV make docker-build +$ TAG=DEV make container ``` Note: this will use the Docker daemon @@ -102,13 +102,7 @@ eval $(minikube docker-env) This will allow you to publish images to Minikube VM, allowing you to reference them -in your Deployment specs. - -### Push the container image to a remote repository - -```console -$ TAG=DEV REGISTRY=$USER/kong-ingress-controller make docker-push -``` +in your Deployment specs.` ## Deploying From 7f34ff01c39b3759843f0d5c51cb7ec8d6e86088 Mon Sep 17 00:00:00 2001 From: yuchunyu97 Date: Fri, 10 Jul 2020 15:27:57 +0800 Subject: [PATCH 2/4] docs: remove extra characters in CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 58c2291fd4..403e465fc4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -102,7 +102,7 @@ eval $(minikube docker-env) This will allow you to publish images to Minikube VM, allowing you to reference them -in your Deployment specs.` +in your Deployment specs. ## Deploying From dc653d5aa54817dcbe9d40b4a4a3e93c3afd5729 Mon Sep 17 00:00:00 2001 From: yuchunyu97 Date: Wed, 15 Jul 2020 11:08:13 +0800 Subject: [PATCH 3/4] add docker push --- CONTRIBUTING.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 403e465fc4..2c5c07139d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,8 +75,8 @@ go run -tags gcp ./cli/ingress-controller/ \ ## Building Build is performed via Makefile. Depending on your -requirements you can build a raw server binary -or a local container image. +requirements you can build a raw server binary, a local container image, +or push an image to a remote repository. ### Build a raw server binary @@ -104,6 +104,14 @@ This will allow you to publish images to Minikube VM, allowing you to reference them in your Deployment specs. +### Push the container image to a remote repository + +```console +$ docker push docker.example.com/registry/kong-ingress-controller:DEV +``` + +Replace `docker.example.com/registry` with your registry URL. + ## Deploying There are several ways to deploy Kong Ingress Controller onto a cluster. From bf3abb566d6ff53816136c4fb7ae193ff6254db4 Mon Sep 17 00:00:00 2001 From: yuchunyu97 Date: Wed, 15 Jul 2020 11:13:30 +0800 Subject: [PATCH 4/4] uniform the docker image name when build and push --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2c5c07139d..3cb2f95c78 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -87,7 +87,7 @@ $ make build ### Build a local container image ```console -$ TAG=DEV make container +$ TAG=DEV REGISTRY=docker.example.com/registry make container ``` Note: this will use the Docker daemon @@ -110,7 +110,7 @@ in your Deployment specs. $ docker push docker.example.com/registry/kong-ingress-controller:DEV ``` -Replace `docker.example.com/registry` with your registry URL. +Note: replace `docker.example.com/registry` with your registry URL. ## Deploying