Skip to content

Commit

Permalink
Fix build of docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
rodrigorm committed Sep 4, 2017
1 parent c6c56ec commit acfd678
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
@@ -1,5 +1,5 @@
FROM gliderlabs/alpine:3.2
RUN apk --update add bash curl go git mercurial
FROM gliderlabs/alpine:3.6
RUN apk --update add bash curl go git mercurial musl-dev

RUN curl -Ls https://github.com/progrium/execd/releases/download/v0.1.0/execd_0.1.0_Linux_x86_64.tgz \
| tar -zxC /bin \
Expand All @@ -14,7 +14,7 @@ ADD ./data /tmp/data
ENV GOPATH /go
COPY . /go/src/github.com/progrium/envy
WORKDIR /go/src/github.com/progrium/envy
RUN go get && CGO_ENABLED=0 go build -a -installsuffix cgo -o /bin/envy \
RUN go get && CGO_ENABLED=0 go build -a -buildmode exe -installsuffix cgo -o /bin/envy \
&& ln -s /bin/envy /bin/enter \
&& ln -s /bin/envy /bin/auth \
&& ln -s /bin/envy /bin/serve
Expand Down
2 changes: 1 addition & 1 deletion Makefile
@@ -1,7 +1,7 @@

build: hterm
docker build -t progrium/envy .
docker tag -f progrium/envy progrium/envy:local
docker tag progrium/envy progrium/envy:local

dev:
docker build -t progrium/envy:dev -f Dockerfile .
Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd.go
Expand Up @@ -19,7 +19,7 @@ func ClientMode() bool {

func RunClient(args []string) {
log.SetFlags(0)
client, err := ssh.Dial("unix", EnvySocket, new(ssh.ClientConfig))
client, err := ssh.Dial("unix", EnvySocket, &ssh.ClientConfig{HostKeyCallback: ssh.InsecureIgnoreHostKey()})
assert(err)
session, err := client.NewSession()
assert(err)
Expand Down

0 comments on commit acfd678

Please sign in to comment.