[bitnami/gitea] Release 1.19.1-debian-11-r3 (#31246)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
2026-02-10 21:27:26 +08:00 · 2023-04-24 09:32:36 +02:00
parent 69885fb7ef
commit 13192af9b5
6 changed files with 111 additions and 19 deletions
--- a/bitnami/gitea/1/debian-11/Dockerfile
+++ b/bitnami/gitea/1/debian-11/Dockerfile
@@ -2,11 +2,12 @@ FROM docker.io/bitnami/minideb:bullseye

 ARG TARGETARCH

-LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-04-19T05:05:09Z" \
+LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \
+      org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
+      org.opencontainers.image.created="2023-04-22T05:29:04Z" \
      org.opencontainers.image.description="Application packaged by VMware, Inc" \
      org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.19.1-debian-11-r2" \
+      org.opencontainers.image.ref.name="1.19.1-debian-11-r3" \
      org.opencontainers.image.title="gitea" \
      org.opencontainers.image.vendor="VMware, Inc." \
      org.opencontainers.image.version="1.19.1"
@@ -22,10 +23,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages acl ca-certificates curl git procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
    COMPONENTS=( \
-      "wait-for-port-1.0.6-4-linux-${OS_ARCH}-debian-11" \
-      "render-template-1.0.5-4-linux-${OS_ARCH}-debian-11" \
-      "ini-file-1.4.5-4-linux-${OS_ARCH}-debian-11" \
-      "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \
+      "wait-for-port-1.0.6-6-linux-${OS_ARCH}-debian-11" \
+      "render-template-1.0.5-5-linux-${OS_ARCH}-debian-11" \
+      "ini-file-1.4.5-5-linux-${OS_ARCH}-debian-11" \
      "gitea-1.19.1-0-linux-${OS_ARCH}-debian-11" \
    ) && \
    for COMPONENT in "${COMPONENTS[@]}"; do \
--- a/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -5,28 +5,22 @@
        "type": "NAMI",
        "version": "1.19.1-0"
    },
-    "gosu": {
-        "arch": "amd64",
-        "distro": "debian-11",
-        "type": "NAMI",
-        "version": "1.16.0-5"
-    },
    "ini-file": {
        "arch": "amd64",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "1.4.5-4"
+        "version": "1.4.5-5"
    },
    "render-template": {
        "arch": "amd64",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "1.0.5-4"
+        "version": "1.0.5-5"
    },
    "wait-for-port": {
        "arch": "amd64",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "1.0.6-4"
+        "version": "1.0.6-6"
    }
 }
--- a/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -553,3 +553,98 @@ get_root_disk_device_id() {
 get_root_disk_size() {
    fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true
 }
+
+########################
+# Run command as a specific user and group (optional)
+# Arguments:
+#   $1 - USER(:GROUP) to switch to
+#   $2..$n - command to execute
+# Returns:
+#   Exit code of the specified command
+#########################
+run_as_user() {
+    run_chroot "$@"
+}
+
+########################
+# Execute command as a specific user and group (optional),
+# replacing the current process image
+# Arguments:
+#   $1 - USER(:GROUP) to switch to
+#   $2..$n - command to execute
+# Returns:
+#   Exit code of the specified command
+#########################
+exec_as_user() {
+    run_chroot --replace-process "$@"
+}
+
+########################
+# Run a command using chroot
+# Arguments:
+#   $1 - USER(:GROUP) to switch to
+#   $2..$n - command to execute
+# Flags:
+#   -r | --replace-process - Replace the current process image (optional)
+# Returns:
+#   Exit code of the specified command
+#########################
+run_chroot() {
+    local userspec
+    local user
+    local homedir
+    local replace=false
+    local -r cwd="$(pwd)"
+
+    # Parse and validate flags
+    while [[ "$#" -gt 0 ]]; do
+        case "$1" in
+            -r | --replace-process)
+                replace=true
+                ;;
+            --)
+                shift
+                break
+                ;;
+            -*)
+                stderr_print "unrecognized flag $1"
+                return 1
+                ;;
+            *)
+                break
+                ;;
+        esac
+        shift
+    done
+
+    # Parse and validate arguments
+    if [[ "$#" -lt 2 ]]; then
+        echo "expected at least 2 arguments"
+        return 1
+    else
+        userspec=$1
+        shift
+
+        # userspec can optionally include the group, so we parse the user
+        user=$(echo "$userspec" | cut -d':' -f1)
+    fi
+
+    if ! am_i_root; then
+        error "Could not switch to '${userspec}': Operation not permitted"
+        return 1
+    fi
+
+    # Get the HOME directory for the user to switch, as chroot does
+    # not properly update this env and some scripts rely on it
+    homedir=$(eval echo "~${user}")
+    if [[ ! -d $homedir ]]; then
+        homedir="${HOME:-/}"
+    fi
+
+    # Obtaining value for "$@" indirectly in order to properly support shell parameter expansion
+    if [[ "$replace" = true ]]; then
+        exec chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@"
+    else
+        chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@"
+    fi
+}
--- a/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea/entrypoint.sh
+++ b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea/entrypoint.sh
@@ -28,7 +28,10 @@ if ! am_i_root; then
        export NSS_WRAPPER_PASSWD
        NSS_WRAPPER_GROUP="$(mktemp)"
        export NSS_WRAPPER_GROUP
-        echo "gitea:x:$(id -u):$(id -g):gitea:/opt/bitnami/gitea:/bin/false" >"$NSS_WRAPPER_PASSWD"
+        if [[ "$HOME" == "/" ]]; then
+            export HOME=/opt/bitnami/gitea
+        fi
+        echo "gitea:x:$(id -u):$(id -g):gitea:${HOME}:/bin/false" >"$NSS_WRAPPER_PASSWD"
        echo "gitea:x:$(id -g):" >"$NSS_WRAPPER_GROUP"
        chmod 400 "$NSS_WRAPPER_PASSWD" "$NSS_WRAPPER_GROUP"
    fi
--- a/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea/run.sh
+++ b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea/run.sh
@@ -22,7 +22,7 @@ args+=("$@")

 info "** Starting Gitea **"
 if am_i_root; then
-    exec gosu "$GITEA_DAEMON_USER" "${cmd[@]}" "${args[@]}"
+    exec_as_user "$GITEA_DAEMON_USER" "${cmd[@]}" "${args[@]}"
 else
    exec "${cmd[@]}" "${args[@]}"
 fi
--- a/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/libgitea.sh
+++ b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/libgitea.sh
@@ -326,7 +326,7 @@ gitea_start_bg() {
    local -r args=("--config=${GITEA_CONF_FILE}" "--pid=${GITEA_PID_FILE}" "--custom-path=${GITEA_CUSTOM_DIR}" "--work-path=${GITEA_WORK_DIR}")

    if am_i_root; then
-        gosu "$GITEA_DAEMON_USER" "${cmd[@]}" "${args[@]}" >"$log_file" 2>&1 &
+        run_as_user "$GITEA_DAEMON_USER" "${cmd[@]}" "${args[@]}" >"$log_file" 2>&1 &
    else
        "${cmd[@]}" "${args[@]}" >"$log_file" 2>&1 &
    fi