From 6cf964e7cd37c37a032aca76fbf06252509549ed Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 22 Feb 2023 15:14:43 +0100
Subject: [PATCH] [bitnami/harbor-registryctl] Release 2.7.1-debian-11-r1
 (#24884)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 .../harbor-registryctl/2/debian-11/Dockerfile |  8 ++---
 .../opt/bitnami/.bitnami_components.json      |  4 +--
 .../opt/bitnami/scripts/libservice.sh         | 33 +++++++++----------
 bitnami/harbor-registryctl/README.md          |  2 +-
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/bitnami/harbor-registryctl/2/debian-11/Dockerfile b/bitnami/harbor-registryctl/2/debian-11/Dockerfile
index bf5aa5019c5a..73f34b276089 100644
--- a/bitnami/harbor-registryctl/2/debian-11/Dockerfile
+++ b/bitnami/harbor-registryctl/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-21T12:01:00Z" \
+      org.opencontainers.image.created="2023-02-22T13:59:37Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.7.1-debian-11-r0" \
+      org.opencontainers.image.ref.name="2.7.1-debian-11-r1" \
       org.opencontainers.image.title="harbor-registryctl" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.7.1"
@@ -23,8 +23,8 @@ RUN install_packages ca-certificates curl procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "yq-4.31.1-0-linux-${OS_ARCH}-debian-11" \
-      "harbor-registry-2.7.1-0-linux-${OS_ARCH}-debian-11" \
-      "harbor-registryctl-2.7.1-0-linux-${OS_ARCH}-debian-11" \
+      "harbor-registry-2.7.1-1-linux-${OS_ARCH}-debian-11" \
+      "harbor-registryctl-2.7.1-1-linux-${OS_ARCH}-debian-11" \
       "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 5bd5cbbcb715..10edde112664 100644
--- a/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -11,14 +11,14 @@
         "digest": "674851da6b09acf26b688f1a435645573701b581ade0b8cb200ac38d5b19b8c1",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.7.1-0"
+        "version": "2.7.1-1"
     },
     "harbor-registryctl": {
         "arch": "amd64",
         "digest": "db7c34b4d70c2ac57ecddca2c02b047d690729c9c9ae7fa26205d8ea3bd8feaf",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.7.1-0"
+        "version": "2.7.1-1"
     },
     "yq": {
         "arch": "amd64",
diff --git a/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index f964ab09fcba..af64e198ad2d 100644
--- a/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/harbor-registryctl/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
diff --git a/bitnami/harbor-registryctl/README.md b/bitnami/harbor-registryctl/README.md
index 19b8b0afee29..d12578f55caf 100644
--- a/bitnami/harbor-registryctl/README.md
+++ b/bitnami/harbor-registryctl/README.md
@@ -48,7 +48,7 @@ Subscribe to project updates by watching the [bitnami/containers GitHub repo](ht
 
 Harbor Registryctl is a component of the Harbor application. In order to get the Harbor application running on Kubernetes we encourage you to check the [bitnami/harbor Helm chart](https://github.com/bitnami/charts/tree/master/bitnami/harbor) and configure it using the options exposed in the values.yaml file.
 
-For further information about the specific component itself, please refer to the [source repository documentation](https://github.com/goharbor/harbor/tree/master/docs).
+For further information about the specific component itself, please refer to the [source repository documentation](https://github.com/goharbor/harbor/tree/main/docs).
 
 ## Contributing