Change override entrypoint to /usr/bin/env

pkg/build/strategies/sti/sti.go

@@ -27,7 +27,7 @@ import (
 
 var (
 	// DefaultEntrypoint is the default entry point used when starting containers
-	DefaultEntrypoint = []string{"/bin/env"}
+	DefaultEntrypoint = []string{"/usr/bin/env"}
 
 	glog = utilglog.StderrLog
 

pkg/docker/docker.go

@@ -704,7 +704,7 @@ func (d *stiDocker) RunContainer(opts RunContainerOptions) error {
 	// is trying to set an entrypoint, ignore it.  We only want to
 	// set the entrypoint if we need to override a default entrypoint
 	// in the image.  This allows us to still work with a minimal image
-	// that does not contain "/bin/env" since we don't attempt to override
+	// that does not contain "/usr/bin/env" since we don't attempt to override
 	// the entrypoint.
 	if len(opts.Entrypoint) != 0 {
 		entrypoint, err := d.GetImageEntrypoint(image)

test/integration/images/sti-fake-env/Dockerfile

@@ -3,7 +3,9 @@
 #
 FROM busybox
 
-RUN mkdir -p /sti-fake/src
+RUN mkdir -p /sti-fake/src && \
+	mkdir /usr/bin && \
+	ln -s /bin/env /usr/bin/env
 
 WORKDIR /
 

test/integration/images/sti-fake-no-tar/Dockerfile

@@ -4,6 +4,8 @@
 FROM busybox
 
 RUN mkdir -p /sti-fake/src && \
-    rm /bin/tar
+    rm /bin/tar && \
+	mkdir /usr/bin && \
+	ln -s /bin/env /usr/bin/env
 
 WORKDIR /

test/integration/images/sti-fake-scripts-no-save-artifacts/Dockerfile

@@ -4,7 +4,9 @@
 FROM busybox
 
 RUN mkdir -p /sti-fake/src && \
-    mkdir -p /tmp/scripts
+    mkdir -p /tmp/scripts && \
+	mkdir /usr/bin && \
+	ln -s /bin/env /usr/bin/env
 
 WORKDIR /
 

test/integration/images/sti-fake-scripts/Dockerfile

@@ -4,7 +4,9 @@
 FROM busybox
 
 RUN mkdir -p /sti-fake/src && \
-    mkdir -p /tmp/scripts
+    mkdir -p /tmp/scripts && \
+	mkdir /usr/bin && \
+	ln -s /bin/env /usr/bin/env
 
 WORKDIR /
 

test/integration/images/sti-fake/Dockerfile

@@ -3,7 +3,9 @@
 #
 FROM busybox
 
-RUN mkdir -p /sti-fake/src && mkdir -p /opt/app-root/src
+RUN mkdir -p /sti-fake/src && mkdir -p /opt/app-root/src && \
+	mkdir /usr/bin && \
+	ln -s /bin/env /usr/bin/env
 
 WORKDIR /opt/app-root/src