From a8e7259bf8462a3526912954fb43f556b2919c8f Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 16 Nov 2018 15:03:46 +0200 Subject: [PATCH 1/4] Makefile: add 'push' target Now 'make push' can be used to push the container image to the remote registry. --- Makefile | 4 ++++ README.md | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index c8473b734..78f889723 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ .FORCE: IMAGE_BUILD_CMD := docker build +IMAGE_PUSH_CMD := docker push VERSION := $(shell git describe --tags --dirty --always) @@ -39,3 +40,6 @@ mock: test: go test ./cmd/... ./pkg/... + +push: + $(IMAGE_PUSH_CMD) $(IMAGE_TAG) diff --git a/README.md b/README.md index f24eb6703..c4a10fb33 100644 --- a/README.md +++ b/README.md @@ -611,15 +611,16 @@ attribute in the spec template(s) to the new location There are several Makefile variables that control the build process and the name of the resulting container image. -| Variable | Description | Default value -| -------------- | ------------------------------------ | ------------------- | -| IMAGE_BUILD_CMD | Command to build the image | docker build -| IMAGE_REGISTRY | Container image registry to use | quay.io/kubernetes_incubator -| IMAGE_NAME | Container image name | node-feature-discovery -| IMAGE_TAG_NAME | Container image tag name | <nfd version> -| IMAGE_REPO | Container image repository to use | <IMAGE_REGISTRY>/<IMAGE_NAME> -| IMAGE_TAG | Full image:tag to tag the image with | <IMAGE_REPO>/<IMAGE_NAME> -| K8S_NAMESPACE | nfd-master and nfd-worker namespace | kube-system +| Variable | Description | Default value +| -------------- | -------------------------------------------- | ----------- | +| IMAGE_BUILD_CMD | Command to build the image | docker build +| IMAGE_PUSH_CMD | Command to push the image to remote registry | docker push +| IMAGE_REGISTRY | Container image registry to use | quay.io/kubernetes_incubator +| IMAGE_NAME | Container image name | node-feature-discovery +| IMAGE_TAG_NAME | Container image tag name | <nfd version> +| IMAGE_REPO | Container image repository to use | <IMAGE_REGISTRY>/<IMAGE_NAME> +| IMAGE_TAG | Full image:tag to tag the image with | <IMAGE_REPO>/<IMAGE_NAME> +| K8S_NAMESPACE | nfd-master and nfd-worker namespace | kube-system For example, to use a custom registry: ``` From 2cfb3ade5d18cd53765716cf67a11b490ede67d8 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 16 Nov 2018 15:32:48 +0200 Subject: [PATCH 2/4] Makefile: add IMAGE_BUILD_EXTRA_OPTS variable --- Makefile | 4 +++- README.md | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 78f889723..15b10f7a7 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ .FORCE: IMAGE_BUILD_CMD := docker build +IMAGE_BUILD_EXTRA_OPTS := IMAGE_PUSH_CMD := docker push VERSION := $(shell git describe --tags --dirty --always) @@ -20,7 +21,8 @@ all: image image: yamls $(IMAGE_BUILD_CMD) --build-arg NFD_VERSION=$(VERSION) \ - -t $(IMAGE_TAG) ./ + -t $(IMAGE_TAG) \ + $(IMAGE_BUILD_EXTRA_OPTS) ./ yamls: $(yaml_instances) diff --git a/README.md b/README.md index c4a10fb33..93ac38597 100644 --- a/README.md +++ b/README.md @@ -611,16 +611,17 @@ attribute in the spec template(s) to the new location There are several Makefile variables that control the build process and the name of the resulting container image. -| Variable | Description | Default value -| -------------- | -------------------------------------------- | ----------- | -| IMAGE_BUILD_CMD | Command to build the image | docker build -| IMAGE_PUSH_CMD | Command to push the image to remote registry | docker push -| IMAGE_REGISTRY | Container image registry to use | quay.io/kubernetes_incubator -| IMAGE_NAME | Container image name | node-feature-discovery -| IMAGE_TAG_NAME | Container image tag name | <nfd version> -| IMAGE_REPO | Container image repository to use | <IMAGE_REGISTRY>/<IMAGE_NAME> -| IMAGE_TAG | Full image:tag to tag the image with | <IMAGE_REPO>/<IMAGE_NAME> -| K8S_NAMESPACE | nfd-master and nfd-worker namespace | kube-system +| Variable | Description | Default value +| ---------------------- | -------------------------------------------- | ----------- | +| IMAGE_BUILD_CMD | Command to build the image | docker build +| IMAGE_BUILD_EXTRA_OPTS | Extra options to pass to build command | *empty* +| IMAGE_PUSH_CMD | Command to push the image to remote registry | docker push +| IMAGE_REGISTRY | Container image registry to use | quay.io/kubernetes_incubator +| IMAGE_NAME | Container image name | node-feature-discovery +| IMAGE_TAG_NAME | Container image tag name | <nfd version> +| IMAGE_REPO | Container image repository to use | <IMAGE_REGISTRY>/<IMAGE_NAME> +| IMAGE_TAG | Full image:tag to tag the image with | <IMAGE_REPO>/<IMAGE_NAME> +| K8S_NAMESPACE | nfd-master and nfd-worker namespace | kube-system For example, to use a custom registry: ``` From 118146a1ee4b029cf5f0b913ef152e9fb666a337 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 31 Aug 2018 11:27:00 +0300 Subject: [PATCH 3/4] travis: build image using make Better to use the same method that developers are supposed to use. Plus, this creates runnable images (as NFD version is defined). --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b658ef303..eec89970c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ services: - docker script: - - docker build -t quay.io/kubernetes_incubator/node-feature-discovery . + - make image From 30883827724083b558840e624ca59ae5c4376789 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 30 Aug 2018 15:43:15 +0300 Subject: [PATCH 4/4] travis: add deploy step to automatically push the container image Configure .travis.yml to automatically push builds on the master branch to the container image registry (quay.io by default). This will automatically make the latest "experimental" version of NFD, built from the tip of the master branch, available in the upstream Docker repository. IMAGE_REPO_USER and IMAGE_REPO_PASSWORD environment variables must be defined in the travis repositorys settings in order for the deployment step to be triggered. --- .travis.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eec89970c..cd4d45f09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,19 @@ language: minimal +env: + global: + # Sanitize git branch name into a valid docker tag name + - IMAGE_TAG_NAME=$(echo -n $TRAVIS_BRANCH | tr -c "[a-zA-Z0-9._'" "_") + services: - docker script: - - make image + - make image -e + +deploy: + on: + branch: master + condition: -n "$IMAGE_REPO_USER" + provider: script + script: echo "$IMAGE_REPO_PASSWORD" | docker login -u "$IMAGE_REPO_USER" --password-stdin quay.io && make push -e