[bitnami/git] Release 2.39.2-debian-11-r3 (#24887)

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

bitnami/git/2/debian-11/Dockerfile

@@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-02-20T14:41:57Z" \
+      org.opencontainers.image.created="2023-02-22T13:50:02Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.39.2-debian-11-r2" \
+      org.opencontainers.image.ref.name="2.39.2-debian-11-r3" \
       org.opencontainers.image.title="git" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.39.2"
@@ -22,7 +22,7 @@ RUN install_packages ca-certificates curl less libbrotli1 libcom-err2 libcurl4 l
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
-      "git-2.39.2-1-linux-${OS_ARCH}-debian-11" \
+      "git-2.39.2-2-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \

bitnami/git/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json

@@ -4,7 +4,7 @@
         "digest": "d81056d25bc290e242e22e2d72f6a47b745479c1a2fce0bcd268418fa266975d",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.39.2-1"
+        "version": "2.39.2-2"
     },
     "gosu": {
         "arch": "amd64",

bitnami/git/2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh

@@ -305,6 +305,8 @@ generate_systemd_conf() {
     local exec_reload=""
     local restart="always"
     local pid_file=""
+    local standard_output="journal"
+    local standard_error=""
     # Parse CLI flags
     shift
     while [[ "$#" -gt 0 ]]; do
@@ -318,6 +320,8 @@ generate_systemd_conf() {
             | --exec-reload \
             | --restart \
             | --pid-file \
+            | --standard-output \
+            | --standard-error \
             )
                 var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
                 shift
@@ -362,36 +366,33 @@ ExecStart=${exec_start}
 EOF
     # Optional stop and reload commands
     if [[ -n "$exec_stop" ]]; then
-        cat >> "$service_file" <<EOF
-ExecStop=${exec_stop}
-EOF
+        cat >> "$service_file" <<< "ExecStop=${exec_stop}"
     fi
     if [[ -n "$exec_reload" ]]; then
-        cat >> "$service_file" <<EOF
-ExecReload=${exec_reload}
-EOF
+        cat >> "$service_file" <<< "ExecReload=${exec_reload}"
     fi
     # User and group
     if [[ -n "$user" ]]; then
-        cat >> "$service_file" <<EOF
-User=${user}
-EOF
+        cat >> "$service_file" <<< "User=${user}"
     fi
     if [[ -n "$group" ]]; then
-        cat >> "$service_file" <<EOF
-Group=${group}
-EOF
+        cat >> "$service_file" <<< "Group=${group}"
     fi
     # PID file allows to determine if the main process is running properly (for Restart=always)
     if [[ -n "$pid_file" ]]; then
-        cat >> "$service_file" <<EOF
-PIDFile=${pid_file}
-EOF
+        cat >> "$service_file" <<< "PIDFile=${pid_file}"
     fi
     # Environment flags (may be specified multiple times in a unit)
     if [[ -n "$environment" ]]; then
         cat >> "$service_file" <<< "$environment"
     fi
+    # Logging
+    if [[ -n "$standard_output" ]]; then
+        cat >> "$service_file" <<< "StandardOutput=${standard_output}"
+    fi
+    if [[ -n "$standard_error" ]]; then
+        cat >> "$service_file" <<< "StandardError=${standard_error}"
+    fi
     cat >> "$service_file" <<EOF
 Restart=${restart}
 # Optimizations
@@ -400,8 +401,6 @@ IgnoreSIGPIPE=no
 KillMode=mixed
 # Limits
 LimitNOFILE=infinity
-# Configure output to appear in instance console output
-StandardOutput=journal+console
 
 [Install]
 # Enabling/disabling the main bitnami service should cause the same effect for this service

bitnami/git/README.md

@@ -70,7 +70,7 @@ docker run --name git bitnami/git:latest git --version
 * The `ENTRYPOINT` of the container has been modified to load a proper NSS environment that enables git ssh connections when running the container as non-root.
 * The `CMD` is also changed to enter the Bash shell.
 
-If you were using the container without replacing the entrypoint [`ENTRYPOINT [ "git" ]`](https://github.com/bitnami/containers/blob/main/bitnami/git/blob/af46ea91cebed3de1a863cb9969210688131b4e9/2/debian-10/Dockerfile#L19), make sure you specify the `git` command now:
+If you were using the container without replacing the entrypoint, make sure you specify the `git` command now:
 
 ```diff
 -docker run bitnami/git:latest --version