Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to report the correct version inside container. #58

Merged

Conversation

balajismaniam
Copy link
Contributor

@balajismaniam balajismaniam commented Dec 9, 2016

Fixes #54. Tested manually.

  • Removed demo directory from .dockerignore.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 9, 2016
@ConnorDoyle
Copy link
Contributor

Not opposed to this fix, but we could also consider injecting the version instead of trying to compute it inside the container? We could look at using --build-arg in the makefile (https://docs.docker.com/engine/reference/commandline/build/#/set-build-time-variables---build-arg)

- Used build args to pass the correct version.
@balajismaniam
Copy link
Contributor Author

@ConnorDoyle I updated it. PTAL. See output below.

root@e6ca80a74e13:/go/src/github.com/kubernetes-incubator/node-feature-discovery# git status
On branch fix-nfd-version-suffix
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        deleted:    demo/README.md
        deleted:    demo/docker-images/Dockerfile-CloverLeaf
        deleted:    demo/docker-images/Dockerfile-PARSEC
        deleted:    demo/docs/performance-comparison-cloverleaf-norm.png
        deleted:    demo/docs/performance-comparison-parsec-norm.png
        deleted:    demo/helper-scripts/aggregate-logs-and-plot.sh
        deleted:    demo/helper-scripts/box-plot-norm.R
        deleted:    demo/helper-scripts/box-plot.R
        deleted:    demo/helper-scripts/clean-up.sh
        deleted:    demo/helper-scripts/demo-pod-with-discovery.json.parsec.template
        deleted:    demo/helper-scripts/demo-pod-with-discovery.yaml.cloverleaf.template
        deleted:    demo/helper-scripts/demo-pod-without-discovery.json.template
        deleted:    demo/helper-scripts/run-with-discovery.sh
        deleted:    demo/helper-scripts/run-without-discovery.sh

no changes added to commit (use "git add" and/or "git commit -a")
root@e6ca80a74e13:/go/src/github.com/kubernetes-incubator/node-feature-discovery# /go/bin/node-feature-discovery --version
node-feature-discovery cc335e6
root@e6ca80a74e13:/go/src/github.com/kubernetes-incubator/node-feature-discovery# git describe --tags --dirty --always
cc335e6-dirty

@ConnorDoyle
Copy link
Contributor

Nice.

@ConnorDoyle
Copy link
Contributor

/lgtm

@nfd-merge-bot nfd-merge-bot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 9, 2016
@nfd-merge-bot
Copy link
Contributor

Automatic merge from submit-queue

@nfd-merge-bot nfd-merge-bot merged commit 0569d22 into kubernetes-sigs:master Dec 9, 2016
@balajismaniam balajismaniam deleted the fix-nfd-version-suffix branch December 9, 2016 23:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants