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.

Sign up for GitHub

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

Improved build process and consistency #25

Closed
wants to merge 1 commit into from
Closed

Improved build process and consistency #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,4 @@ flycheck_*.el
/.project

# ignore build directory
_output/

bin/
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ COPY ./examples/flex-debug.sh /opt/csi-provisioner/

# install the go kube piece of provisioner

COPY ./_output/csi-provisioner /opt/csi-provisioner/
COPY ./bin/csi-provisioner /opt/csi-provisioner/
Copy link
Contributor

Choose a reason for hiding this comment

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

let's make _output/bin for binaries. Change here and in Makefile and README too.

Copy link
Contributor

Choose a reason for hiding this comment

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

It should be the same as attacher, which uses bin/ too.

Copy link
Contributor

Choose a reason for hiding this comment

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

I do not like bin/ for build artifacts.... It's a common directory for scripts or other real binaries that might be part of the project.. _output/bin would be fine.



ENTRYPOINT ["/opt/csi-provisioner/csi-provisioner"]
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ container: build quick-container
.PHONY: container

clean:
rm -f external-provisioner
rm -rf _output
rm -rf bin
.PHONY: clean

format:
Expand All @@ -52,8 +51,9 @@ push-container:
.PHONY: push-container

provisioner:
mkdir -p _output
go build -i -o _output/csi-provisioner ./cmd/csi-provisioner/
mkdir -p bin
go install github.com/kubernetes-csi/external-provisioner/cmd/csi-provisioner
cp ${GOPATH}/bin/csi-provisioner bin/csi-provisioner
.PHONY: provisioner

all build: provisioner
Expand Down