From 0f8a4572ef8f5a7cca0ae51aa8a89936aa84b76f Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 27 Sep 2022 12:24:52 +0200
Subject: [PATCH] [bitnami/jenkins] Release 2.361.1-debian-11-r9 (#8064)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/jenkins/2/debian-11/Dockerfile               |  2 +-
 .../rootfs/opt/bitnami/scripts/libjenkins.sh         | 12 ++++++++----
 bitnami/jenkins/README.md                            |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bitnami/jenkins/2/debian-11/Dockerfile b/bitnami/jenkins/2/debian-11/Dockerfile
index 012dc83cf5e8..659e7aea5f14 100644
--- a/bitnami/jenkins/2/debian-11/Dockerfile
+++ b/bitnami/jenkins/2/debian-11/Dockerfile
@@ -5,7 +5,7 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="2.361.1-debian-11-r8" \
+      org.opencontainers.image.ref.name="2.361.1-debian-11-r9" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/jenkins" \
       org.opencontainers.image.title="jenkins" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/libjenkins.sh b/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/libjenkins.sh
index f8ff1e629398..880620d93a03 100644
--- a/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/libjenkins.sh
+++ b/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/libjenkins.sh
@@ -208,10 +208,14 @@ jenkins_initialize() {
 
     if is_mounted_dir_empty "$JENKINS_HOME"; then
         # Plugins
-        debug "Moving plugins to $JENKINS_HOME"
-        ensure_dir_exists "${JENKINS_HOME}/plugins"
-        mv "${JENKINS_BASE_DIR}/plugins"/* "${JENKINS_HOME}/plugins"
-        am_i_root && configure_permissions_ownership "${JENKINS_HOME}/plugins" -d "755" -f "644" -u "$JENKINS_DAEMON_USER" -g "$JENKINS_DAEMON_GROUP"
+        if ! is_dir_empty "${JENKINS_BASE_DIR}/plugins"; then
+            debug "Moving plugins to $JENKINS_HOME"
+            ensure_dir_exists "${JENKINS_HOME}/plugins"
+            mv "${JENKINS_BASE_DIR}/plugins"/* "${JENKINS_HOME}/plugins"
+            am_i_root && configure_permissions_ownership "${JENKINS_HOME}/plugins" -d "755" -f "644" -u "$JENKINS_DAEMON_USER" -g "$JENKINS_DAEMON_GROUP"
+        else
+            debug "${JENKINS_BASE_DIR}/plugins is empty, assuming a restart"
+        fi
         if ! is_mounted_dir_empty "$JENKINS_MOUNTED_CONTENT_DIR"; then
             info "Moving custom mounted files to Jenkins home directory"
             echo "--- Copying files at $(date)" >>"${JENKINS_LOGS_DIR}/copy_reference_file.log"
diff --git a/bitnami/jenkins/README.md b/bitnami/jenkins/README.md
index 3f1ae25ebfef..3b5ebd5bd1b3 100644
--- a/bitnami/jenkins/README.md
+++ b/bitnami/jenkins/README.md
@@ -41,7 +41,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`2`, `2-debian-11`, `2.361.1`, `2.361.1-debian-11-r8`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/jenkins/2/debian-11/Dockerfile)
+* [`2`, `2-debian-11`, `2.361.1`, `2.361.1-debian-11-r9`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/jenkins/2/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).