Skip to content

Commit

Permalink
Merge pull request #19 from davidz627/master
Browse files Browse the repository at this point in the history
QoL improvements for Makefile and .gitignore
  • Loading branch information
jsafrane authored Jan 11, 2018
2 parents 951f0e3 + 10718b7 commit a76ea0a
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 6 deletions.
35 changes: 33 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Compiled binaries and deployment files
/bin/
/deploy/docker/csi-attacher

# Binaries for programs and plugins
*.exe
*.dll
Expand All @@ -10,5 +14,32 @@
# Output of the go coverage tool, specifically when used with LiteIDE
*.out

# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
.glide/
# OSX leaves these everywhere on SMB shares
._*

# OSX trash
.DS_Store

# Eclipse files
.classpath
.project
.settings/**

# Files generated by JetBrains IDEs, e.g. IntelliJ IDEA
.idea/
*.iml

# Vscode files
.vscode

# Emacs save files
*~
\#*\#
.\#*

# Vim-related files
[._]*.s[a-w][a-z]
[._]s[a-w][a-z]
*.un~
Session.vim
.netrwhist
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,22 @@ IMAGE_VERSION=latest
ifdef V
TESTARGS = -v -args -alsologtostderr -v 5
else
TESTARGS =
TESTARGS =
endif


all: csi-attacher

csi-attacher:
go build -o csi-attacher cmd/csi-attacher/main.go
go install github.com/kubernetes-csi/external-attacher/cmd/csi-attacher
mkdir -p bin
cp ${GOPATH}/bin/csi-attacher bin/csi-attacher

clean:
-rm -rf csi-attacher deploy/docker/csi-attacher
-rm -rf bin deploy/docker/csi-attacher

container: csi-attacher
cp csi-attacher deploy/docker
cp bin/csi-attacher deploy/docker
docker build -t $(IMAGE_NAME):$(IMAGE_VERSION) deploy/docker

push: container
Expand Down

0 comments on commit a76ea0a

Please sign in to comment.