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

Add dockerfile build in Makefile #8

Merged
merged 2 commits into from
Jun 19, 2018
Merged

Add dockerfile build in Makefile #8

merged 2 commits into from
Jun 19, 2018

Conversation

sufuf3
Copy link
Contributor

@sufuf3 sufuf3 commented Jun 19, 2018

No description provided.

Makefile Outdated

## dockerfiles/ ########################################
docker.build:
docker build -t="sdnvortex/cv-server:latest" ./dockerfiles/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use the dockerfiles/dockerfile as the dependency of target docker.build
Please rebase master and check the build won't fail.

By the way, use the variable for tag, such as

--tag $(DOCKER_REGISTRY)/$(PROJECT):$(IMAGE_TAG) \
--file $< .

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove ARG BRAND=aurora

@sufuf3 sufuf3 force-pushed the sufuf3/make-docker branch from 6e3f241 to cb7ca00 Compare June 19, 2018 05:42
@codecov-io
Copy link

codecov-io commented Jun 19, 2018

Codecov Report

Merging #8 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff           @@
##           master      #8   +/-   ##
======================================
  Coverage    46.9%   46.9%           
======================================
  Files          11      11           
  Lines         307     307           
======================================
  Hits          144     144           
  Misses        152     152           
  Partials       11      11

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2b8309e...4791ad6. Read the comment docs.

Copy link
Contributor

@hwchiu hwchiu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also fix the typo in the Makefile
voetext --> vortex

Makefile Outdated
## For docker
DOCKER_REGISTRY = sdnvortex
IMAGE_TAG = latest
PROJECT = cv-server
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

project is vortex.

@sufuf3 sufuf3 force-pushed the sufuf3/make-docker branch from cb7ca00 to f9cd5e0 Compare June 19, 2018 07:01

ENV CGO_ENABLED 0
ENV GOOS linux
ENV TIMEZONE "Asia/Shanghai"
ARG BUILD_MODE=release
ARG BRAND=aurora
ARG BRAND=vortex
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hwchiu BRAND should be removed not changed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This BRAND is for L24.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need the BRAND here, that's for our previous project.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also modify the L24 to remove the BRAND, Thanks

@sufuf3 sufuf3 force-pushed the sufuf3/make-docker branch from f9cd5e0 to 51fa044 Compare June 19, 2018 08:40
@sufuf3 sufuf3 requested a review from hwchiu June 19, 2018 08:45
@sufuf3
Copy link
Contributor Author

sufuf3 commented Jun 19, 2018

I fixed it.
@hwchiu would you please help me review it?
Thanks.

sufuf3 added 2 commits June 19, 2018 17:01
- Add docker build
- Fix typo from vortext to vortex
@sufuf3 sufuf3 force-pushed the sufuf3/make-docker branch from 51fa044 to 4791ad6 Compare June 19, 2018 09:02
Copy link
Contributor

@hwchiu hwchiu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM


ENV CGO_ENABLED 0
ENV GOOS linux
ENV TIMEZONE "Asia/Shanghai"
ARG BUILD_MODE=release
ARG BRAND=aurora
ARG BRAND=vortex
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also modify the L24 to remove the BRAND, Thanks

@hwchiu hwchiu merged commit 1ef925f into master Jun 19, 2018
@John-Lin John-Lin deleted the sufuf3/make-docker branch June 20, 2018 04:05
John-Lin pushed a commit that referenced this pull request Jul 25, 2018
DEV: Phstsai/add kube state metrics

Approved-by: Yo-An Lin <[email protected]>
Approved-by: Hung-Wei Chiu <[email protected]>

Former-commit-id: c2568673160410ee5c27de9dd6ec1556d07159e7 [formerly da59bf3]
Former-commit-id: 6c81e35fc5be5c022fc666d558a549b42c32175e
John-Lin pushed a commit that referenced this pull request Jul 25, 2018
Add dockerfile build in Makefile

Former-commit-id: abbe5cc086466197393150e28bea8d0c218a2427 [formerly 1ef925f]
Former-commit-id: 1f3ce17a40dc17fbf3a06e4b62194ac695a10813
John-Lin pushed a commit that referenced this pull request Jul 25, 2018
DEV: Phstsai/add kube state metrics

Approved-by: Yo-An Lin <[email protected]>
Approved-by: Hung-Wei Chiu <[email protected]>

Former-commit-id: c2568673160410ee5c27de9dd6ec1556d07159e7 [formerly c2568673160410ee5c27de9dd6ec1556d07159e7 [formerly da59bf3]]
Former-commit-id: 6c81e35fc5be5c022fc666d558a549b42c32175e
Former-commit-id: d37dd00
John-Lin pushed a commit that referenced this pull request Jul 25, 2018
Add dockerfile build in Makefile

Former-commit-id: abbe5cc086466197393150e28bea8d0c218a2427 [formerly abbe5cc086466197393150e28bea8d0c218a2427 [formerly 1ef925f]]
Former-commit-id: 1f3ce17a40dc17fbf3a06e4b62194ac695a10813
Former-commit-id: cce3dd0
John-Lin pushed a commit that referenced this pull request Jul 25, 2018
DEV: Phstsai/add kube state metrics

Approved-by: Yo-An Lin <[email protected]>
Approved-by: Hung-Wei Chiu <[email protected]>
John-Lin pushed a commit that referenced this pull request Jul 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants