Skip to content

Commit ba93265

Browse files
committed
ref(project): replace deis/go with golang:1.3.
1 parent 83e50cc commit ba93265

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

deisctl/Dockerfile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
1-
FROM deis/base
1+
FROM golang:1.3
2+
23
ENV CGO_ENABLED 0
3-
ADD https://storage.googleapis.com/golang/go1.3.linux-amd64.tar.gz /tmp/
4-
RUN tar -C /usr/local -xzf /tmp/go1.3.linux-amd64.tar.gz
5-
RUN apt-get update && apt-get install -yq git mercurial
6-
ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/go/bin
4+
75
ADD . /go/src/github.com/deis/deis/deisctl
6+
87
ADD systemd /tmp/package/etc/systemd/system
98
ADD units /tmp/package/var/lib/deis/units
109
ADD hooks /tmp/package/var/lib/deis/hooks
1110
ADD deis-version /tmp/package/etc/deis-version
12-
ENV GOPATH /go:/go/src/github.com/deis/deis/deisctl/Godeps/_workspace
11+
1312
WORKDIR /go/src/github.com/deis/deis/deisctl
13+
1414
RUN go get github.com/tools/godep
15+
1516
RUN godep go install -v -a -ldflags '-s' ./...
17+
1618
RUN mkdir -p /tmp/package/opt/bin && cp /go/bin/deisctl /tmp/package/opt/bin/deisctl
19+
1720
RUN tar -C /tmp/package -czf /tmp/deisctl.tar.gz .
21+
1822
ENTRYPOINT ["/go/bin/deisctl"]

logspout/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM deis/go:latest
1+
FROM golang:1.3
22
MAINTAINER OpDemand <info@opdemand.com>
33

44
WORKDIR /go/src/github.com/deis/deis/logspout

publisher/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM deis/go:latest
1+
FROM golang:1.3
22

33
WORKDIR /go/src/github.com/deis/deis/publisher
44
CMD /go/bin/publisher

0 commit comments

Comments
 (0)