diff --git a/bitnami/gitea/1/debian-11/Dockerfile b/bitnami/gitea/1/debian-11/Dockerfile index 9eb7de9b0f55..8017a8f12b09 100644 --- a/bitnami/gitea/1/debian-11/Dockerfile +++ b/bitnami/gitea/1/debian-11/Dockerfile @@ -3,13 +3,13 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-03-22T01:35:43Z" \ + org.opencontainers.image.created="2023-03-29T14:04:42Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.18.5-debian-11-r9" \ + org.opencontainers.image.ref.name="1.19.0-debian-11-r0" \ org.opencontainers.image.title="gitea" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.18.5" + org.opencontainers.image.version="1.19.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -26,7 +26,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "render-template-1.0.5-2-linux-${OS_ARCH}-debian-11" \ "ini-file-1.4.5-2-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ - "gitea-1.18.5-1-linux-${OS_ARCH}-debian-11" \ + "gitea-1.19.0-1-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -43,8 +43,9 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/gitea/postunpack.sh -ENV APP_VERSION="1.18.5" \ +ENV APP_VERSION="1.19.0" \ BITNAMI_APP_NAME="gitea" \ + NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/gitea/bin:$PATH" EXPOSE 2222 3000 diff --git a/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ba5292797bc4..ef1d4a407fe5 100644 --- a/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,35 +1,30 @@ { "gitea": { "arch": "amd64", - "digest": "0eee2d482a13ebf314727cf1c69de45664ec1ae7be38ff73fca64efb21ce749d", "distro": "debian-11", "type": "NAMI", - "version": "1.18.5-1" + "version": "1.19.0-1" }, "gosu": { "arch": "amd64", - "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", "version": "1.16.0-3" }, "ini-file": { "arch": "amd64", - "digest": "c75066994058575c6092fb760bd53feeb2aabd6039e942f3904de57f5a5534dc", "distro": "debian-11", "type": "NAMI", "version": "1.4.5-2" }, "render-template": { "arch": "amd64", - "digest": "d1a128e25098f793a92342efd5fa85c1075a2b21042929b269d23c6694e20c3b", "distro": "debian-11", "type": "NAMI", "version": "1.0.5-2" }, "wait-for-port": { "arch": "amd64", - "digest": "66c83aadf646d230d0cb097d9fe1663911bed94fabf8cbba2a17c39f7c6ffbcc", "distro": "debian-11", "type": "NAMI", "version": "1.0.6-2" diff --git a/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d4b7af6fd3a..6fcb304d34cc 100644 --- a/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -395,7 +395,7 @@ PartOf=bitnami.service Type=${type} EOF if [[ -n "$working_directory" ]]; then - cat >> "$service_file" <<< "WorkingDirectory=$working_directory" + cat >> "$service_file" <<< "WorkingDirectory=${working_directory}" fi if [[ -n "$exec_start_pre" ]]; then # This variable may contain multiple ExecStartPre= directives diff --git a/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..5860791219cf 100644 --- a/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -112,7 +112,11 @@ is_web_server_running() { ######################### web_server_start() { info "Starting $(web_server_type) in background" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl start "bitnami.$(web_server_type).service" + fi } ######################## @@ -126,7 +130,11 @@ web_server_start() { ######################### web_server_stop() { info "Stopping $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl stop "bitnami.$(web_server_type).service" + fi } ######################## @@ -140,7 +148,11 @@ web_server_stop() { ######################### web_server_restart() { info "Restarting $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl restart "bitnami.$(web_server_type).service" + fi } ######################## @@ -153,7 +165,11 @@ web_server_restart() { # None ######################### web_server_reload() { - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl reload "bitnami.$(web_server_type).service" + fi } ######################## diff --git a/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/gitea/nss-wrapper/nss_group b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/gitea/nss-wrapper/nss_group new file mode 100644 index 000000000000..e2c16090793e --- /dev/null +++ b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/gitea/nss-wrapper/nss_group @@ -0,0 +1 @@ +gitea:x:0: diff --git a/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/gitea/nss-wrapper/nss_passwd b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/gitea/nss-wrapper/nss_passwd new file mode 100644 index 000000000000..1bcce518cc2b --- /dev/null +++ b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/gitea/nss-wrapper/nss_passwd @@ -0,0 +1 @@ +gitea:x:1001:0:Gitea:/opt/bitnami/gitea:/bin/false diff --git 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 index 447b786a3e52..7b0ede6bf113 100755 --- 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 @@ -10,12 +10,30 @@ set -o pipefail # Load libraries . /opt/bitnami/scripts/libbitnami.sh . /opt/bitnami/scripts/liblog.sh +. /opt/bitnami/scripts/libos.sh # Load Gitea environment variables . /opt/bitnami/scripts/gitea-env.sh print_welcome_page +# Configure libnss_wrapper based on the UID/GID used to run the container +# This container supports arbitrary UIDs, therefore we have do it dynamically +if ! am_i_root; then + export LNAME="gitea" + export LD_PRELOAD="/opt/bitnami/common/lib/libnss_wrapper.so" + if [[ -f "$LD_PRELOAD" ]]; then + info "Configuring libnss_wrapper" + NSS_WRAPPER_PASSWD="$(mktemp)" + 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" + echo "gitea:x:$(id -g):" >"$NSS_WRAPPER_GROUP" + chmod 400 "$NSS_WRAPPER_PASSWD" "$NSS_WRAPPER_GROUP" + fi +fi + if [[ "$1" = "/opt/bitnami/scripts/gitea/run.sh" ]]; then info "** Starting Gitea setup **" /opt/bitnami/scripts/gitea/setup.sh diff --git a/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea/postunpack.sh b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea/postunpack.sh index af0fba53df32..101f811a00e6 100755 --- a/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea/postunpack.sh +++ b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea/postunpack.sh @@ -34,4 +34,4 @@ done chmod a+x "${GITEA_WORK_DIR}/bin/gitea" render-template "$GITEA_CONF_DIR/app.ini.template" >"$GITEA_CONF_FILE" -chmod g+rw "$GITEA_CONF_FILE" +configure_permissions_ownership "$GITEA_CONF_FILE" -f "664" -u "$GITEA_DAEMON_USER" -g "root" diff --git a/bitnami/gitea/1/debian-11/tags-info.yaml b/bitnami/gitea/1/debian-11/tags-info.yaml index 130d4ad6fd2c..10300be57cc6 100644 --- a/bitnami/gitea/1/debian-11/tags-info.yaml +++ b/bitnami/gitea/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.18.5 +- 1.19.0 - latest