1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2025-03-28 02:37:11 +00:00

Merge pull request #9 from balajismaniam/host-image-in-quay

Hosted docker image in quay.io.
This commit is contained in:
Connor Doyle 2016-09-06 10:15:56 -07:00 committed by GitHub
commit 7ae49a235d
4 changed files with 17 additions and 15 deletions

View file

@ -1,13 +1,14 @@
.PHONY: all
DOCKER_REGISTRY_USER := kubernetesincubator
QUAY_DOMAIN_NAME := quay.io
QUAY_REGISTRY_USER := kubernetes_incubator
DOCKER_IMAGE_NAME := node-feature-discovery
VERSION := $(shell git describe --tags --dirty --always)
all: docker
# To override DOCKER_REGISTRY_USER use the -e option as follows:
# DOCKER_REGISTRY_USER=<my-username> make docker -e
# To override QUAY_REGISTRY_USER use the -e option as follows:
# QUAY_REGISTRY_USER=<my-username> make docker -e
docker:
docker build -t $(DOCKER_REGISTRY_USER)/$(DOCKER_IMAGE_NAME):$(VERSION) ./
docker build -t $(QUAY_DOMAIN_NAME)/$(QUAY_REGISTRY_USER)/$(DOCKER_IMAGE_NAME):$(VERSION) ./

View file

@ -128,21 +128,22 @@ cd <project-root>
make
```
**NOTE: To override the `DOCKER_REGISTRY_USER` use the `-e` option as follows:
`DOCKER_REGISTRY_USER=<my-username> make docker -e`**
**NOTE: Our default docker image is hosted in quay.io. To override the
`QUAY_REGISTRY_USER` use the `-e` option as follows:
`QUAY_REGISTRY_USER=<my-username> make docker -e`**
Push the Docker Image (optional)
```
docker push <registry-user>/<image-name>:<version>
docker push <quay-domain-name>/<registry-user>/<image-name>:<version>
```
**Change the job spec to use your custom image (optional):**
To use your published image from the step above instead of the
`kubernetesincubator/node-feature-discovery` image, edit line 40 in the file
`quay.io/kubernetes_incubator/node-feature-discovery` image, edit line 40 in the file
[node-feature-discovery-job.json.template](node-feature-discovery-job.json.template)
to the new location (`<registry-user>/<image-name>[:<version>]`).
to the new location (`<quay-domain-name>/<registry-user>/<image-name>[:<version>]`).
## Targeting Nodes with Specific Features

10
glide.lock generated
View file

@ -1,5 +1,5 @@
hash: 9943a35009296355c6a66485228855db99eefab65890c8fa89a4776cba9c9b71
updated: 2016-07-28T17:22:20.295749043-07:00
hash: 06660a6f6a53a4d29b7870e5a452ab194c2c99d69107db164f4af5945cc746bc
updated: 2016-09-02T11:18:55.975551365-07:00
imports:
- name: github.com/beorn7/perks
version: 3ac7bf7a47d159a033b107610db8a1b6575507a4
@ -33,7 +33,7 @@ imports:
- httputil
- timeutil
- name: github.com/davecgh/go-spew
version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
version: 2df174808ee097f90d259e432cc04442cf60be21
subpackages:
- spew
- name: github.com/docker/distribution
@ -202,7 +202,7 @@ imports:
- name: github.com/spf13/pflag
version: 08b1a584251b5b62f458943640fc8ebd4d50aaa5
- name: github.com/stretchr/objx
version: 1a9d0bb9f541897e62256577b352fdbc1fb4fd94
version: cbeaeb16a013161a98496fad62933b1d21786672
- name: github.com/stretchr/testify
version: f390dcf405f7b83c997eac1b06768bb9f44dec18
subpackages:
@ -354,7 +354,7 @@ imports:
- pkg/util/net/sets
testImports:
- name: github.com/gopherjs/gopherjs
version: 72e303cb5f235b23471872477b57e573dc1c71d0
version: 45518c130e5bd1525f20110830a4986365a153de
subpackages:
- js
- name: github.com/jtolds/gls

View file

@ -37,7 +37,7 @@
}
}
],
"image": "kubernetesincubator/node-feature-discovery",
"image": "quay.io/kubernetes_incubator/node-feature-discovery",
"name": "node-feature-discovery",
"ports": [
{