Run post build hook with /bin/bash

We need either `/bin/bash -c` or `/bin/sh -ic` to make our supported
images to work properly. That's due to a hack to auto-enable SCLs.
https://github.com/openshift/sti-base/blob/8d95148/Dockerfile#L23-L29

When `/bin/sh` is a symlink to `/bin/bash`, the ENV environment variable
is only evaluated when the shell is started in interactive mode.

Making the shell interactive with `-i` seems to make less sense than
requiring Bash. For images that do not include Bash, the full
Command+Args syntax is the way to go.

Author: rhcarvalho

examples/sample-app/application-template-dockerbuild.json

@@ -144,6 +144,9 @@
             "name": "origin-ruby-sample:latest"
           }
         },
+        "postCommit": {
+          "script": "bundle exec rake test"
+        },
         "resources": {}
       },
       "status": {

examples/sample-app/application-template-pullspecbuild.json

@@ -136,6 +136,9 @@
             "name": "origin-ruby-sample:latest"
           }
         },
+        "postCommit": {
+          "script": "bundle exec rake test"
+        },
         "resources": {}
       },
       "status": {

examples/sample-app/application-template-stibuild.json

@@ -146,6 +146,9 @@
             "name": "origin-ruby-sample:latest"
           }
         },
+        "postCommit": {
+          "script": "bundle exec rake test"
+        },
         "resources": {}
       },
       "status": {

pkg/build/api/types.go

@@ -432,7 +432,7 @@ type SourceBuildStrategy struct {
 // There are five different ways to configure the hook. As an example, all forms
 // below are equivalent and will execute `rake test --verbose`.
 //
-// 1. Shell script:
+// 1. Bash script:
 //
 // 	BuildPostCommitSpec{
 // 		Script: "rake test --verbose",
@@ -441,7 +441,7 @@ type SourceBuildStrategy struct {
 // The above is a convenient form which is equivalent to:
 //
 // 	BuildPostCommitSpec{
-// 		Command: []string{"/bin/sh", "-c"},
+// 		Command: []string{"/bin/bash", "-c"},
 // 		Args: []string{"rake test --verbose"},
 // 	}
 //
@@ -470,8 +470,8 @@ type SourceBuildStrategy struct {
 // 	}
 //
 // This form is useful if you need to pass arguments that would otherwise be
-// hard to quote properly in the shell script. In the script, $0 will be
-// "/bin/sh" and $1, $2, etc, are the positional arguments from Args.
+// hard to quote properly in the Bash script. In the script, $0 will be
+// "/bin/bash" and $1, $2, etc, are the positional arguments from Args.
 //
 // 5. Command with arguments:
 //
@@ -486,19 +486,19 @@ type SourceBuildStrategy struct {
 // the fields are specified, the hook is not executed.
 type BuildPostCommitSpec struct {
 	// Command is the command to run. It may not be specified with Script.
-	// This might be needed if the image doesn't have "/bin/sh", or if you
+	// This might be needed if the image doesn't have `/bin/bash`, or if you
 	// do not want to use a shell. In all other cases, using Script might be
 	// more convenient.
 	Command []string
 	// Args is a list of arguments that are provided to either Command,
 	// Script or the Docker image's default entrypoint. The arguments are
 	// placed immediately after the command to be run.
 	Args []string
-	// Script is a shell script to be run with `/bin/sh -c`. It may not be
+	// Script is a Bash script to be run with `/bin/bash -c`. It may not be
 	// specified with Command. Use Script when a shell script is appropriate
 	// to execute the post build hook, for example for running unit tests
-	// with "rake test". If you need control over the image entrypoint, or
-	// if the image does not have "/bin/sh", use Command and/or Args.
+	// with `rake test`. If you need control over the image entrypoint, or
+	// if the image does not have `/bin/bash`, use Command and/or Args.
 	Script string
 }
 

pkg/build/api/v1/types.go

@@ -415,7 +415,7 @@ type SourceBuildStrategy struct {
 // There are five different ways to configure the hook. As an example, all forms
 // below are equivalent and will execute `rake test --verbose`.
 //
-// 1. Shell script:
+// 1. Bash script:
 //
 // 	BuildPostCommitSpec{
 // 		Script: "rake test --verbose",
@@ -424,7 +424,7 @@ type SourceBuildStrategy struct {
 // The above is a convenient form which is equivalent to:
 //
 // 	BuildPostCommitSpec{
-// 		Command: []string{"/bin/sh", "-c"},
+// 		Command: []string{"/bin/bash", "-c"},
 // 		Args: []string{"rake test --verbose"},
 // 	}
 //
@@ -453,8 +453,8 @@ type SourceBuildStrategy struct {
 // 	}
 //
 // This form is useful if you need to pass arguments that would otherwise be
-// hard to quote properly in the shell script. In the script, $0 will be
-// "/bin/sh" and $1, $2, etc, are the positional arguments from Args.
+// hard to quote properly in the Bash script. In the script, $0 will be
+// "/bin/bash" and $1, $2, etc, are the positional arguments from Args.
 //
 // 5. Command with arguments:
 //
@@ -469,19 +469,19 @@ type SourceBuildStrategy struct {
 // the fields are specified, the hook is not executed.
 type BuildPostCommitSpec struct {
 	// Command is the command to run. It may not be specified with Script.
-	// This might be needed if the image doesn't have "/bin/sh", or if you
+	// This might be needed if the image doesn't have `/bin/bash`, or if you
 	// do not want to use a shell. In all other cases, using Script might be
 	// more convenient.
 	Command []string `json:"command,omitempty" description:"command to be executed in a container running the build output image replacing the image's entrypoint"`
 	// Args is a list of arguments that are provided to either Command,
 	// Script or the Docker image's default entrypoint. The arguments are
 	// placed immediately after the command to be run.
 	Args []string `json:"args,omitempty" description:"arguments to command, script or the default image entrypoint"`
-	// Script is a shell script to be run with `/bin/sh -c`. It may not be
+	// Script is a Bash script to be run with `/bin/bash -c`. It may not be
 	// specified with Command. Use Script when a shell script is appropriate
 	// to execute the post build hook, for example for running unit tests
-	// with "rake test". If you need control over the image entrypoint, or
-	// if the image does not have "/bin/sh", use Command and/or Args.
+	// with `rake test`. If you need control over the image entrypoint, or
+	// if the image does not have `/bin/bash`, use Command and/or Args.
 	Script string `json:"script,omitempty" description:"shell script to be executed in a container running the build output image"`
 }
 

pkg/build/api/v1beta3/types.go

@@ -402,7 +402,7 @@ type SourceBuildStrategy struct {
 // There are five different ways to configure the hook. As an example, all forms
 // below are equivalent and will execute `rake test --verbose`.
 //
-// 1. Shell script:
+// 1. Bash script:
 //
 // 	BuildPostCommitSpec{
 // 		Script: "rake test --verbose",
@@ -411,7 +411,7 @@ type SourceBuildStrategy struct {
 // The above is a convenient form which is equivalent to:
 //
 // 	BuildPostCommitSpec{
-// 		Command: []string{"/bin/sh", "-c"},
+// 		Command: []string{"/bin/bash", "-c"},
 // 		Args: []string{"rake test --verbose"},
 // 	}
 //
@@ -440,8 +440,8 @@ type SourceBuildStrategy struct {
 // 	}
 //
 // This form is useful if you need to pass arguments that would otherwise be
-// hard to quote properly in the shell script. In the script, $0 will be
-// "/bin/sh" and $1, $2, etc, are the positional arguments from Args.
+// hard to quote properly in the Bash script. In the script, $0 will be
+// "/bin/bash" and $1, $2, etc, are the positional arguments from Args.
 //
 // 5. Command with arguments:
 //
@@ -456,19 +456,19 @@ type SourceBuildStrategy struct {
 // the fields are specified, the hook is not executed.
 type BuildPostCommitSpec struct {
 	// Command is the command to run. It may not be specified with Script.
-	// This might be needed if the image doesn't have "/bin/sh", or if you
+	// This might be needed if the image doesn't have `/bin/bash`, or if you
 	// do not want to use a shell. In all other cases, using Script might be
 	// more convenient.
 	Command []string `json:"command,omitempty" description:"command to be executed in a container running the build output image replacing the image's entrypoint"`
 	// Args is a list of arguments that are provided to either Command,
 	// Script or the Docker image's default entrypoint. The arguments are
 	// placed immediately after the command to be run.
 	Args []string `json:"args,omitempty" description:"arguments to command, script or the default image entrypoint"`
-	// Script is a shell script to be run with `/bin/sh -c`. It may not be
+	// Script is a Bash script to be run with `/bin/bash -c`. It may not be
 	// specified with Command. Use Script when a shell script is appropriate
 	// to execute the post build hook, for example for running unit tests
-	// with "rake test". If you need control over the image entrypoint, or
-	// if the image does not have "/bin/sh", use Command and/or Args.
+	// with `rake test`. If you need control over the image entrypoint, or
+	// if the image does not have `/bin/bash`, use Command and/or Args.
 	Script string `json:"script,omitempty" description:"shell script to be executed in a container running the build output image"`
 }
 

pkg/build/builder/common.go

@@ -135,7 +135,7 @@ func execPostCommitHook(client DockerClient, postCommitSpec api.BuildPostCommitS
 	glog.V(4).Infof("Post commit hook spec: %+v", postCommitSpec)
 
 	if script != "" {
-		command = []string{"/bin/sh", "-c"}
+		command = []string{"/bin/bash", "-c"}
 		args = append([]string{script, command[0]}, args...)
 	}
 

test/cmd/builds.sh

@@ -72,21 +72,23 @@ os::cmd::expect_success 'oc delete all --all'
 os::cmd::expect_success "oc new-build -D \$'FROM centos:7' --no-output"
 os::cmd::expect_success_and_text 'oc get bc/centos -o=jsonpath="{.spec.output.to}"' '^<nil>$'
 
+os::cmd::expect_success 'oc delete all --all'
+
 # Ensure output is valid JSON
 os::cmd::expect_success 'oc new-build -D "FROM centos:7" -o json | python -m json.tool'
 
 # Ensure post commit hook is executed
-os::cmd::expect_success 'oc new-build -D "FROM busybox:1"'
-os::cmd::try_until_text 'oc get istag busybox:1' 'busybox@sha256:'
-os::cmd::expect_success 'oc patch bc/busybox -p '\''{"spec":{"postCommit":{"script":"echo hello $1","args":["world"],"command":null}}}'\'
-os::cmd::expect_success_and_text 'oc get bc/busybox -o=jsonpath="{.spec.postCommit['\''script'\'','\''args'\'','\''command'\'']}"' '^echo hello \$1 \[world\] \[\]$'
-# os::cmd::expect_success_and_text 'oc start-build --wait --follow busybox' 'hello world'
-os::cmd::expect_success 'oc patch bc/busybox -p '\''{"spec":{"postCommit":{"command":["sh","-c"],"args":["echo explicit command"],"script":""}}}'\'
-os::cmd::expect_success_and_text 'oc get bc/busybox -o=jsonpath="{.spec.postCommit['\''script'\'','\''args'\'','\''command'\'']}"' ' \[echo explicit command\] \[sh -c\]'
-# os::cmd::expect_success_and_text 'oc start-build --wait --follow busybox' 'explicit command'
-os::cmd::expect_success 'oc patch bc/busybox -p '\''{"spec":{"postCommit":{"args":["echo","default entrypoint"],"command":null,"script":""}}}'\'
-os::cmd::expect_success_and_text 'oc get bc/busybox -o=jsonpath="{.spec.postCommit['\''script'\'','\''args'\'','\''command'\'']}"' ' \[echo default entrypoint\] \[\]'
-# os::cmd::expect_success_and_text 'oc start-build --wait --follow busybox' 'default entrypoint'
+os::cmd::expect_success 'oc new-build -D "FROM centos:7"'
+os::cmd::try_until_text 'oc get istag centos:7' 'centos@sha256:'
+os::cmd::expect_success 'oc patch bc/centos -p '\''{"spec":{"postCommit":{"script":"echo hello $1","args":["world"],"command":null}}}'\'
+os::cmd::expect_success_and_text 'oc get bc/centos -o=jsonpath="{.spec.postCommit['\''script'\'','\''args'\'','\''command'\'']}"' '^echo hello \$1 \[world\] \[\]$'
+# os::cmd::expect_success_and_text 'oc start-build --wait --follow centos' 'hello world'
+os::cmd::expect_success 'oc patch bc/centos -p '\''{"spec":{"postCommit":{"command":["sh","-c"],"args":["echo explicit command"],"script":""}}}'\'
+os::cmd::expect_success_and_text 'oc get bc/centos -o=jsonpath="{.spec.postCommit['\''script'\'','\''args'\'','\''command'\'']}"' ' \[echo explicit command\] \[sh -c\]'
+# os::cmd::expect_success_and_text 'oc start-build --wait --follow centos' 'explicit command'
+os::cmd::expect_success 'oc patch bc/centos -p '\''{"spec":{"postCommit":{"args":["echo","default entrypoint"],"command":null,"script":""}}}'\'
+os::cmd::expect_success_and_text 'oc get bc/centos -o=jsonpath="{.spec.postCommit['\''script'\'','\''args'\'','\''command'\'']}"' ' \[echo default entrypoint\] \[\]'
+# os::cmd::expect_success_and_text 'oc start-build --wait --follow centos' 'default entrypoint'
 echo "postCommitHook: ok"
 
 os::cmd::expect_success 'oc delete all --all'