Skip to content

Commit 63fe7e2

Browse files
committed
dockerfile: remove godep in favor of gpm
1 parent 7800247 commit 63fe7e2

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM google/golang:latest
22

3-
RUN go get -u github.com/tools/godep
4-
RUN go get -u github.com/bmizerany/assert
3+
RUN curl -s https://raw.githubusercontent.com/pote/gpm/v1.2.3/bin/gpm > /usr/local/bin/gpm
4+
RUN chmod +x /usr/local/bin/gpm
55

66
ADD . $GOPATH/src/github.com/bitly/nsq
7-
RUN godep get github.com/bitly/nsq/...
8-
RUN cd $GOPATH/src/github.com/bitly/nsq && godep restore
7+
RUN cd $GOPATH/src/github.com/bitly/nsq && gpm install
8+
RUN go get github.com/bitly/nsq/...
99

1010
RUN cd $GOPATH/src/github.com/bitly/nsq && ./test.sh

apps/nsqd/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM nsqio/nsq:latest
22

3-
RUN cd /gopath/src/github.com/bitly/nsq/apps/nsqd && godep go build .
3+
RUN cd /gopath/src/github.com/bitly/nsq/apps/nsqd && go build .
44
VOLUME ["/data"]
55
EXPOSE 4150
66
EXPOSE 4151

apps/nsqlookupd/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM nsqio/nsq:latest
22

3-
RUN cd /gopath/src/github.com/bitly/nsq/apps/nsqlookupd && godep go build .
3+
RUN cd /gopath/src/github.com/bitly/nsq/apps/nsqlookupd && go build .
44
EXPOSE 4160
55
EXPOSE 4161
66

nsqadmin/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM nsqio/nsq:latest
22

3-
RUN cd /gopath/src/github.com/bitly/nsq/nsqadmin && godep go build .
3+
RUN cd /gopath/src/github.com/bitly/nsq/nsqadmin && go build .
44
EXPOSE 4171
55

66
ENTRYPOINT ["/gopath/src/github.com/bitly/nsq/nsqadmin/nsqadmin"]

0 commit comments

Comments
 (0)