From 640caf1df9a1239282ef0f3778a719e0e70d350b Mon Sep 17 00:00:00 2001
From: wangyu096 <wangyu096@163.com>
Date: Mon, 5 Sep 2022 14:22:55 +0800
Subject: [PATCH 1/7] =?UTF-8?q?bugfix:=20=E5=AE=B9=E5=99=A8=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E5=81=9C=E6=AD=A2=E5=BE=AE=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A7=A6=E5=8F=91shutdown=20hook=20#1251?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charts/bk-job/templates/job-execute/deployment.yaml   | 1 +
 .../kubernetes/images/backend/backend.Dockerfile          | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/support-files/kubernetes/charts/bk-job/templates/job-execute/deployment.yaml b/support-files/kubernetes/charts/bk-job/templates/job-execute/deployment.yaml
index f20ee95d0f..0776cd562c 100644
--- a/support-files/kubernetes/charts/bk-job/templates/job-execute/deployment.yaml
+++ b/support-files/kubernetes/charts/bk-job/templates/job-execute/deployment.yaml
@@ -65,6 +65,7 @@ spec:
           {{- end }}
           image: {{ include "job-execute.image" . }}
           imagePullPolicy: {{ .Values.executeConfig.image.pullPolicy }}
+          terminationGracePeriodSeconds: 120
           env:
             {{- include "job.common.env" . | nindent 12 }}
             - name: BK_JOB_APP_NAME
diff --git a/support-files/kubernetes/images/backend/backend.Dockerfile b/support-files/kubernetes/images/backend/backend.Dockerfile
index 7ee72f9c2c..812005c824 100644
--- a/support-files/kubernetes/images/backend/backend.Dockerfile
+++ b/support-files/kubernetes/images/backend/backend.Dockerfile
@@ -9,9 +9,15 @@ RUN ln -snf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
     echo 'Asia/Shanghai' > /etc/timezone && \
     chmod +x /data/job/exec/startup.sh
 
+# Add Tini
+ENV TINI_VERSION v0.19.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+
 ENV LANG en_US.utf8
 ENV LANGUAGE en_US.utf8
 ENV LC_ALL en_US.utf8
 
 WORKDIR /data/job/exec
-CMD /data/job/exec/startup.sh
+
+ENTRYPOINT ["./tini", "--", "./startup.sh"]

From f21fc869585cc473e2743722dcc72e86b75a3569 Mon Sep 17 00:00:00 2001
From: wangyu096 <wangyu096@163.com>
Date: Mon, 5 Sep 2022 14:30:40 +0800
Subject: [PATCH 2/7] =?UTF-8?q?bugfix:=20=E5=AE=B9=E5=99=A8=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E5=81=9C=E6=AD=A2=E5=BE=AE=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A7=A6=E5=8F=91shutdown=20hook=20#1251?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charts/bk-job/templates/job-execute/deployment.yaml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support-files/kubernetes/charts/bk-job/templates/job-execute/deployment.yaml b/support-files/kubernetes/charts/bk-job/templates/job-execute/deployment.yaml
index 0776cd562c..e63b5fe09e 100644
--- a/support-files/kubernetes/charts/bk-job/templates/job-execute/deployment.yaml
+++ b/support-files/kubernetes/charts/bk-job/templates/job-execute/deployment.yaml
@@ -65,7 +65,6 @@ spec:
           {{- end }}
           image: {{ include "job-execute.image" . }}
           imagePullPolicy: {{ .Values.executeConfig.image.pullPolicy }}
-          terminationGracePeriodSeconds: 120
           env:
             {{- include "job.common.env" . | nindent 12 }}
             - name: BK_JOB_APP_NAME
@@ -136,6 +135,7 @@ spec:
             - name: job-gse-tls-password
               mountPath: /etc/secrets
               readOnly: true
+      terminationGracePeriodSeconds: 120
       volumes:
         - name: job-storage
           persistentVolumeClaim:

From 964bf90cab5ba6c1dd8446fb2e9c2b0553b731e1 Mon Sep 17 00:00:00 2001
From: wangyu096 <wangyu096@163.com>
Date: Mon, 5 Sep 2022 14:46:29 +0800
Subject: [PATCH 3/7] =?UTF-8?q?bugfix:=20=E5=AE=B9=E5=99=A8=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E5=81=9C=E6=AD=A2=E5=BE=AE=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A7=A6=E5=8F=91shutdown=20hook=20#1251?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 support-files/kubernetes/images/backend/backend.Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/support-files/kubernetes/images/backend/backend.Dockerfile b/support-files/kubernetes/images/backend/backend.Dockerfile
index 812005c824..3cff0b0f5d 100644
--- a/support-files/kubernetes/images/backend/backend.Dockerfile
+++ b/support-files/kubernetes/images/backend/backend.Dockerfile
@@ -11,8 +11,8 @@ RUN ln -snf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
 
 # Add Tini
 ENV TINI_VERSION v0.19.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /data/job/exec/tini
+RUN chmod +x /data/job/exec/tini
 
 ENV LANG en_US.utf8
 ENV LANGUAGE en_US.utf8
@@ -20,4 +20,4 @@ ENV LC_ALL en_US.utf8
 
 WORKDIR /data/job/exec
 
-ENTRYPOINT ["./tini", "--", "./startup.sh"]
+ENTRYPOINT ["./tini", "--", "/data/job/exec/startup.sh"]

From 7d54be5e0fa9d61c6f0e62f01516c9daa1f62fe3 Mon Sep 17 00:00:00 2001
From: wangyu096 <wangyu096@163.com>
Date: Mon, 5 Sep 2022 15:10:32 +0800
Subject: [PATCH 4/7] =?UTF-8?q?bugfix:=20=E5=AE=B9=E5=99=A8=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E5=81=9C=E6=AD=A2=E5=BE=AE=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A7=A6=E5=8F=91shutdown=20hook=20#1251?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 support-files/kubernetes/images/backend/startup.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/support-files/kubernetes/images/backend/startup.sh b/support-files/kubernetes/images/backend/startup.sh
index defb1065d8..4e905f4708 100644
--- a/support-files/kubernetes/images/backend/startup.sh
+++ b/support-files/kubernetes/images/backend/startup.sh
@@ -53,7 +53,7 @@ if [[ "$OTEL_TRACE_ENABLED" == "true" ]];then
     fi
 fi
 
-java -server \
+exec java -server \
      $OTEL_OPTS \
      -Dfile.encoding=UTF-8 \
      -Djob.log.dir=$BK_JOB_LOG_BASE_DIR \
@@ -69,4 +69,5 @@ java -server \
      -XX:ErrorFile=$BK_JOB_LOG_DIR/error_sys.log \
      -Dspring.profiles.active=$BK_JOB_PROFILE \
      $BK_JOB_JVM_OPTION \
-     -jar /data/job/exec/$BK_JOB_JAR
+     -jar /data/job/exec/$BK_JOB_JAR \
+     "$@"

From 6a2fb57c620cdc6ba029add807b99bd181606952 Mon Sep 17 00:00:00 2001
From: wangyu096 <wangyu096@163.com>
Date: Mon, 5 Sep 2022 16:54:53 +0800
Subject: [PATCH 5/7] =?UTF-8?q?bugfix:=20=E5=AE=B9=E5=99=A8=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E5=81=9C=E6=AD=A2=E5=BE=AE=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A7=A6=E5=8F=91shutdown=20hook=20#1251?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../images/backend/backend.Dockerfile           |   7 ++-----
 support-files/kubernetes/images/backend/tini    | Bin 0 -> 24064 bytes
 2 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100755 support-files/kubernetes/images/backend/tini

diff --git a/support-files/kubernetes/images/backend/backend.Dockerfile b/support-files/kubernetes/images/backend/backend.Dockerfile
index 3cff0b0f5d..cb1899e390 100644
--- a/support-files/kubernetes/images/backend/backend.Dockerfile
+++ b/support-files/kubernetes/images/backend/backend.Dockerfile
@@ -7,12 +7,9 @@ ENV BK_JOB_HOME=/data/job/exec
 COPY ./ /data/job/exec/
 RUN ln -snf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
     echo 'Asia/Shanghai' > /etc/timezone && \
-    chmod +x /data/job/exec/startup.sh
+    chmod +x /data/job/exec/startup.sh \
+    chmod +x /data/job/exec/tini
 
-# Add Tini
-ENV TINI_VERSION v0.19.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /data/job/exec/tini
-RUN chmod +x /data/job/exec/tini
 
 ENV LANG en_US.utf8
 ENV LANGUAGE en_US.utf8
diff --git a/support-files/kubernetes/images/backend/tini b/support-files/kubernetes/images/backend/tini
new file mode 100755
index 0000000000000000000000000000000000000000..86cb766c6b8af2564ac9201df913fe079acae3d1
GIT binary patch
literal 24064
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
UV|=&pPDuNIx8Ueh$t(2#0WQjAz5oCK

literal 0
HcmV?d00001


From 1b5a2f95889ce475139a6485feecb78d3d1de5d5 Mon Sep 17 00:00:00 2001
From: wangyu096 <wangyu096@163.com>
Date: Mon, 5 Sep 2022 17:09:14 +0800
Subject: [PATCH 6/7] =?UTF-8?q?bugfix:=20=E5=AE=B9=E5=99=A8=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E5=81=9C=E6=AD=A2=E5=BE=AE=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A7=A6=E5=8F=91shutdown=20hook=20#1251?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 support-files/kubernetes/images/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support-files/kubernetes/images/build.sh b/support-files/kubernetes/images/build.sh
index f8aa95def9..b7662bb08c 100755
--- a/support-files/kubernetes/images/build.sh
+++ b/support-files/kubernetes/images/build.sh
@@ -198,7 +198,7 @@ build_backend_module () {
     rm -rf tmp/*
     cp $BACKEND_DIR/release/$SERVICE-$VERSION.jar tmp/$SERVICE.jar
     cp $SUPPORT_FILES_DIR/javaagent/opentelemetry-javaagent.jar tmp/
-    cp backend/startup.sh tmp/
+    cp backend/startup.sh backend/tini tmp/
     docker build -f backend/backend.Dockerfile -t $REGISTRY/$SERVICE:$VERSION tmp --network=host
     if [[ $PUSH -eq 1 ]] ; then
         docker push $REGISTRY/$SERVICE:$VERSION

From 057d46e1abdf625803d5141ed6f78d788e4b0913 Mon Sep 17 00:00:00 2001
From: wangyu096 <wangyu096@163.com>
Date: Mon, 5 Sep 2022 18:15:11 +0800
Subject: [PATCH 7/7] =?UTF-8?q?bugfix:=20=E5=AE=B9=E5=99=A8=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E5=81=9C=E6=AD=A2=E5=BE=AE=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A7=A6=E5=8F=91shutdown=20hook=20#1251?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 support-files/kubernetes/images/backend/backend.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support-files/kubernetes/images/backend/backend.Dockerfile b/support-files/kubernetes/images/backend/backend.Dockerfile
index cb1899e390..57f954a312 100644
--- a/support-files/kubernetes/images/backend/backend.Dockerfile
+++ b/support-files/kubernetes/images/backend/backend.Dockerfile
@@ -7,7 +7,7 @@ ENV BK_JOB_HOME=/data/job/exec
 COPY ./ /data/job/exec/
 RUN ln -snf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
     echo 'Asia/Shanghai' > /etc/timezone && \
-    chmod +x /data/job/exec/startup.sh \
+    chmod +x /data/job/exec/startup.sh && \
     chmod +x /data/job/exec/tini