switch to /bin/sh instead of /bin/bash for portability

This commit is contained in:
Brad Rydzewski 2015-06-06 14:00:36 -07:00
parent a169bec6dc
commit 362eea3b16
2 changed files with 12 additions and 1 deletions

11
Dockerfile.env Normal file
View file

@ -0,0 +1,11 @@
# build environment used in .drone.yml
#
# docker build --rm=true -t drone/golang -f Dockerfile.env .
FROM gliderlabs/alpine:3.1
RUN apk update && apk add ca-certificates curl git mercurial bzr perl openssh go && rm -rf /var/cache/apk/*
ENV GOROOT /usr/lib/go
ENV GOPATH /drone
ENV GOBIN /drone/bin
ENV PATH $PATH:$GOROOT/bin:$GOPATH/bin

View file

@ -92,7 +92,7 @@ func execClone(c *Context) (int, error) {
func execBuild(c *Context) (int, error) { func execBuild(c *Context) (int, error) {
conf := toContainerConfig(c.Conf.Build) conf := toContainerConfig(c.Conf.Build)
conf.Entrypoint = []string{"/bin/bash", "-e"} conf.Entrypoint = []string{"/bin/sh", "-e"}
conf.Cmd = []string{"/drone/bin/build.sh"} conf.Cmd = []string{"/drone/bin/build.sh"}
info, err := run(c.client, conf, c.Conf.Build.Pull) info, err := run(c.client, conf, c.Conf.Build.Pull)
if err != nil { if err != nil {