Skip to content

Commit

Permalink
introduce glide
Browse files Browse the repository at this point in the history
  • Loading branch information
nanofi committed Oct 29, 2015
1 parent 70b3720 commit c0dc229
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 17 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@

docker-mysql
dist/
*.tar.gz
vendor/
glide
15 changes: 7 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
language: go
go:
- 1.4
- 1.5
sudo: false
install:
- make deps
script:
- make test
before_deploy:
- make tool
- make release
deploy:
provider: releases
api_key:
secure: i4LFQ1kyX97abC925LrvK4rVO7zzaaqsZzWBCHSjxUBunKVtTe7jc8XHHG0Mh2qJfdog+sCh57+AmZsDy3B6fw3ZSrpFJh2miHPRWWdpfjCEVqQFHzQrfVm7hfqSYg+p7n4yxyY0FCNZ7T6/fNef/W8TUdvhc/RyZvgZ9eqePJw=
skip_cleanup: true
file:
- docker-mysql-linux-386-0.1.0.tar.gz
- docker-mysql-linux-amd64-0.1.0.tar.gz
- docker-mysql-linux-arm-0.1.0.tar.gz
- docker-mysql-darwin-386-0.1.0.tar.gz
- docker-mysql-darwin-amd64-0.1.0.tar.gz
- docker-mysql-linux-386-0.2.0.tar.gz
- docker-mysql-linux-amd64-0.2.0.tar.gz
- docker-mysql-linux-arm-0.2.0.tar.gz
- docker-mysql-darwin-386-0.2.0.tar.gz
- docker-mysql-darwin-amd64-0.2.0.tar.gz
on:
tags: true
all_branches: true
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN \
wget -P /usr/local/bin https://godist.herokuapp.com/projects/ddollar/forego/releases/current/linux-amd64/forego && \
chmod u+x /usr/local/bin/forego

ENV CONTAINER_VERSION 0.1.0
ENV CONTAINER_VERSION 0.2.0
RUN \
wget https://github.com/nanofi/docker-mysql/releases/download/$CONTAINER_VERSION/docker-mysql-linux-amd64-$CONTAINER_VERSION.tar.gz && \
tar -xvzf docker-mysql-linux-amd64-$CONTAINER_VERSION.tar.gz && \
Expand Down
24 changes: 16 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
.SILENT :
.PHONY : docker-mysql clean fmt

OS:=linux
GLIDE_VERSION:=0.6.1
GLIDE_ZIP:=glide-$(OS)-$(GLIDE_VERSION).zip
TAG:=`git describe --abbrev=0 --tags`
LDFLAGS:=-X main.buildVersion $(TAG)
LDFLAGS:=-X main.buildVersion=$(TAG)

all: docker-mysql

deps:
go get github.com/mitchellh/gox
go get github.com/fsouza/go-dockerclient
$(GLIDE_ZIP):
wget https://github.com/Masterminds/glide/releases/download/$(GLIDE_VERSION)/glide-$(OS)-amd64.zip -O $(GLIDE_ZIP)

glide: $(GLIDE_ZIP)
unzip $(GLIDE_ZIP) $(OS)-amd64/glide
mv $(OS)-amd64/glide .
rm -rf $(OS)-amd64

tool:
gox -build-toolchain -os "darwin linux"
deps: glide
go get github.com/mitchellh/gox
./glide install

test:
go test -v
Expand All @@ -24,7 +32,7 @@ dist-clean:
rm -rf dist

dist: dist-clean
gox -os "darwin linux" -output "dist/{{.Dir}}-{{.OS}}-{{.Arch}}"
gox -ldflags "$(LDFLAGS)" -os "darwin linux" -output "dist/{{.Dir}}-{{.OS}}-{{.Arch}}"

release: dist
release: deps dist
ls dist | xargs -I {} tar -cvzf {}-$(TAG).tar.gz dist/{}
3 changes: 3 additions & 0 deletions glide.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package: main
import:
- package: github.com/fsouza/go-dockerclient

0 comments on commit c0dc229

Please sign in to comment.