From 517e26573e8ba20909f5bbfc69609394546f09b7 Mon Sep 17 00:00:00 2001
From: jay-johnson <jay.p.h.johnson@gmail.com>
Date: Wed, 31 Aug 2022 20:00:27 +0000
Subject: [PATCH] Fixes #758 -> migrating the jenkins-master from
 install-plugins.sh to jenkins-plugin-cli and migrating /sbin/tini to
 /usr/bin/tini

---
 pkg/configuration/base/resources/pod.go               |  2 +-
 pkg/configuration/base/resources/scripts_configmap.go | 10 +++++-----
 pkg/configuration/base/validate_test.go               |  4 ++--
 website/content/en/docs/Developer Guide/_index.md     |  3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkg/configuration/base/resources/pod.go b/pkg/configuration/base/resources/pod.go
index 89c507429..1a2949714 100644
--- a/pkg/configuration/base/resources/pod.go
+++ b/pkg/configuration/base/resources/pod.go
@@ -53,7 +53,7 @@ func GetJenkinsMasterContainerBaseCommand() []string {
 	return []string{
 		"bash",
 		"-c",
-		fmt.Sprintf("%s/%s && exec /sbin/tini -s -- /usr/local/bin/jenkins.sh",
+		fmt.Sprintf("%s/%s && exec /usr/bin/tini -s -- /usr/local/bin/jenkins.sh",
 			JenkinsScriptsVolumePath, InitScriptName),
 	}
 }
diff --git a/pkg/configuration/base/resources/scripts_configmap.go b/pkg/configuration/base/resources/scripts_configmap.go
index ef2bc3b6d..e9ca60d5a 100644
--- a/pkg/configuration/base/resources/scripts_configmap.go
+++ b/pkg/configuration/base/resources/scripts_configmap.go
@@ -12,7 +12,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-const installPluginsCommand = "install-plugins.sh"
+const installPluginsCommand = "jenkins-plugin-cli"
 
 // bash scripts installs single jenkins plugin with specific version
 const installPluginsBashScript = `#!/bin/bash -eu
@@ -348,9 +348,9 @@ cat > {{ .JenkinsHomePath }}/base-plugins << EOF
 EOF
 
 if [[ -z "${OPENSHIFT_JENKINS_IMAGE_VERSION}" ]]; then
-  {{ $installPluginsCommand }} < {{ .JenkinsHomePath }}/base-plugins
+  {{ $installPluginsCommand }} -f {{ .JenkinsHomePath }}/base-plugins
 else
-  {{ $installPluginsCommand }} {{ .JenkinsHomePath }}/base-plugins
+  {{ $installPluginsCommand }} -f {{ .JenkinsHomePath }}/base-plugins
 fi
 echo "Installing plugins required by Operator - end"
 
@@ -361,9 +361,9 @@ cat > {{ .JenkinsHomePath }}/user-plugins << EOF
 {{ end }}
 EOF
 if [[ -z "${OPENSHIFT_JENKINS_IMAGE_VERSION}" ]]; then
-  {{ $installPluginsCommand }} < {{ .JenkinsHomePath }}/user-plugins
+  {{ $installPluginsCommand }} -f {{ .JenkinsHomePath }}/user-plugins
 else
-  {{ $installPluginsCommand }} {{ .JenkinsHomePath }}/user-plugins
+  {{ $installPluginsCommand }} -f {{ .JenkinsHomePath }}/user-plugins
 fi
 echo "Installing plugins required by user - end"
 `))
diff --git a/pkg/configuration/base/validate_test.go b/pkg/configuration/base/validate_test.go
index 70f1db0f2..ad4d7c635 100644
--- a/pkg/configuration/base/validate_test.go
+++ b/pkg/configuration/base/validate_test.go
@@ -905,7 +905,7 @@ func TestValidateJenkinsMasterContainerCommand(t *testing.T) {
 							Command: []string{
 								"bash",
 								"-c",
-								fmt.Sprintf("%s/%s && my-extra-command.sh && exec /sbin/tini -s -- /usr/local/bin/jenkins.sh",
+								fmt.Sprintf("%s/%s && my-extra-command.sh && exec /usr/bin/tini -s -- /usr/local/bin/jenkins.sh",
 									resources.JenkinsScriptsVolumePath, resources.InitScriptName),
 							},
 						},
@@ -929,7 +929,7 @@ func TestValidateJenkinsMasterContainerCommand(t *testing.T) {
 							Command: []string{
 								"bash",
 								"-c",
-								fmt.Sprintf("%s/%s && my-extra-command.sh && /sbin/tini -s -- /usr/local/bin/jenkins.sh",
+								fmt.Sprintf("%s/%s && my-extra-command.sh && /usr/bin/tini -s -- /usr/local/bin/jenkins.sh",
 									resources.JenkinsScriptsVolumePath, resources.InitScriptName),
 							},
 						},
diff --git a/website/content/en/docs/Developer Guide/_index.md b/website/content/en/docs/Developer Guide/_index.md
index 6dbaf2289..b52eb4604 100644
--- a/website/content/en/docs/Developer Guide/_index.md	
+++ b/website/content/en/docs/Developer Guide/_index.md	
@@ -132,7 +132,8 @@ items:
       - command:
         - bash
         - -c
-        - /var/jenkins/scripts/init.sh && exec /sbin/tini -s -- /usr/local/bin/jenkins.sh
+        - /var/jenkins/scripts/init.sh
+        - exec /usr/bin/tini -s -- /usr/local/bin/jenkins.sh
         env:
         - name: JAVA_OPTS
           value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap