Skip to content

Commit a5c915a

Browse files
moulmoul
committed
Merge branch 'internal-vendoring'
* internal-vendoring: Added caveat Removed Godep dependency Using internal vendoring
2 parents 2238290 + f431b52 commit a5c915a

File tree

216 files changed

+98
-1256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+98
-1256
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
/scaleway-cli
33
/scw
44
scwversion/version.go
5-
#Godeps/
65
dist/
76

87
# junk

‎Dockerfile‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ FROM golang:cross
22

33
ENV CGO_ENABLED 0
44

5-
# Install Godep for vendoring
6-
RUN go get github.com/tools/godep
75
# Recompile the standard library without CGO
86
RUN go install -a std
97

@@ -14,26 +12,26 @@ MAINTAINER Scaleway Team <[email protected]> (@scaleway)
1412

1513
# For convenience, set an env variable with the path of the code
1614
ENV APP_DIR /go/src/github.com/scaleway/scaleway-cli
15+
WORKDIR $APP_DIR
1716

1817
ADD . /go/src/github.com/scaleway/scaleway-cli
1918

20-
#RUN cd $APP_DIR && godep get && godep save
2119

2220
# Compile the binary and statically link
23-
RUN cd $APP_DIR && GOOS=darwin GOARCH=amd64 godep go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Darwin-x86_64
24-
RUN cd $APP_DIR && GOOS=darwin GOARCH=386 godep go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Darwin-i386
25-
RUN cd $APP_DIR && GOOS=linux GOARCH=386 godep go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Linux-i386
26-
#RUN cd $APP_DIR && GOOS=linux GOARCH=amd64 godep go build -a -v -ldflags '-w -s' -o /go/bin/scw-Linux-x86_64
21+
RUN GOOS=darwin GOARCH=amd64 go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Darwin-x86_64
22+
RUN GOOS=darwin GOARCH=386 go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Darwin-i386
23+
RUN GOOS=linux GOARCH=386 go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Linux-i386
24+
#RUN GOOS=linux GOARCH=amd64 go build -a -v -ldflags '-w -s' -o /go/bin/scw-Linux-x86_64
2725
RUN cp /go/bin/scw-Linux-i386 /go/bin/scw-Linux-x86_64
28-
RUN cd $APP_DIR && GOOS=linux GOARCH=arm GOARM=5 godep go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Linux-arm
29-
RUN cd $APP_DIR && GOOS=linux GOARCH=arm GOARM=6 godep go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Linux-armv6
30-
RUN cd $APP_DIR && GOOS=linux GOARCH=arm GOARM=7 godep go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Linux-armv7
31-
RUN cd $APP_DIR && GOOS=freebsd GOARCH=amd64 godep go build -a -v -ldflags '-w -s' -o /go/bin/scw-Freebsd-x86_64
32-
RUN cd $APP_DIR && GOOS=freebsd GOARCH=386 godep go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Freebsd-i386
33-
RUN cd $APP_DIR && GOOS=freebsd GOARCH=arm GOARM=5 godep go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Freebsd-arm
34-
#RUN cd $APP_DIR && GOOS=openbsd GOARCH=amd64 godep go build -a -v -ldflags '-w -s' -o /go/bin/scw-Openbsd-x86_64
35-
#RUN cd $APP_DIR && GOOS=openbsd GOARCH=386 godep go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Openbsd-i386
36-
#RUN cd $APP_DIR && GOOS=openbsd GOARCH=arm GOARM=5 godep go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Openbsd-arm
37-
RUN cd $APP_DIR && GOOS=windows GOARCH=amd64 godep go build -a -v -ldflags '-w -s' -o /go/bin/scw-Windows-x86_64.exe
38-
#RUN cd $APP_DIR && GOOS=windows GOARCH=386 godep go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Windows-i386
39-
#RUN cd $APP_DIR && GOOS=windows GOARCH=arm GOARM=5 godep go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Windows-arm
26+
RUN GOOS=linux GOARCH=arm GOARM=5 go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Linux-arm
27+
RUN GOOS=linux GOARCH=arm GOARM=6 go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Linux-armv6
28+
RUN GOOS=linux GOARCH=arm GOARM=7 go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Linux-armv7
29+
RUN GOOS=freebsd GOARCH=amd64 go build -a -v -ldflags '-w -s' -o /go/bin/scw-Freebsd-x86_64
30+
RUN GOOS=freebsd GOARCH=386 go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Freebsd-i386
31+
RUN GOOS=freebsd GOARCH=arm GOARM=5 go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Freebsd-arm
32+
#RUN GOOS=openbsd GOARCH=amd64 go build -a -v -ldflags '-w -s' -o /go/bin/scw-Openbsd-x86_64
33+
#RUN GOOS=openbsd GOARCH=386 go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Openbsd-i386
34+
#RUN GOOS=openbsd GOARCH=arm GOARM=5 go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Openbsd-arm
35+
RUN GOOS=windows GOARCH=amd64 go build -a -v -ldflags '-w -s' -o /go/bin/scw-Windows-x86_64.exe
36+
#RUN GOOS=windows GOARCH=386 go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Windows-i386
37+
#RUN GOOS=windows GOARCH=arm GOARM=5 go build -a -v -ldflags '-d -w -s' -o /go/bin/scw-Windows-arm

‎Godeps/Godeps.json‎

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎Godeps/Readme‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎Godeps/_workspace/.gitignore‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/basic/basic.go‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/hook/hook.go‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash.go‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)