diff --git a/bitnami/gitea/1/debian-12/Dockerfile b/bitnami/gitea/1/debian-12/Dockerfile index 9466b40edd45..24e21e543760 100644 --- a/bitnami/gitea/1/debian-12/Dockerfile +++ b/bitnami/gitea/1/debian-12/Dockerfile @@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-05-23T07:45:20Z" \ + org.opencontainers.image.created="2026-05-25T11:40:31Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/gitea/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/gitea" \ @@ -52,7 +52,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/gitea/postunpack.sh ENV APP_VERSION="1.26.2" \ BITNAMI_APP_NAME="gitea" \ - IMAGE_REVISION="1" \ + IMAGE_REVISION="2" \ NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/gitea/bin:$PATH" diff --git a/bitnami/gitea/1/debian-12/docker-compose.yml b/bitnami/gitea/1/debian-12/docker-compose.yml index b887f1b61066..5d8d01f859c4 100644 --- a/bitnami/gitea/1/debian-12/docker-compose.yml +++ b/bitnami/gitea/1/debian-12/docker-compose.yml @@ -17,6 +17,7 @@ services: volumes: - 'gitea_data:/bitnami/gitea' environment: + - GITEA_ADMIN_PASSWORD=bitnami - GITEA_DATABASE_HOST=postgresql - GITEA_DATABASE_NAME=bitnami_gitea - GITEA_DATABASE_USERNAME=bn_gitea diff --git a/bitnami/gitea/1/debian-12/rootfs/opt/bitnami/scripts/gitea-env.sh b/bitnami/gitea/1/debian-12/rootfs/opt/bitnami/scripts/gitea-env.sh index 67ec6e3680d2..97701cfa6749 100644 --- a/bitnami/gitea/1/debian-12/rootfs/opt/bitnami/scripts/gitea-env.sh +++ b/bitnami/gitea/1/debian-12/rootfs/opt/bitnami/scripts/gitea-env.sh @@ -97,7 +97,7 @@ export GITEA_LOG_ROOT_PATH="${GITEA_LOG_ROOT_PATH:-${GITEA_TMP_DIR}/log}" export GITEA_LOG_MODE="${GITEA_LOG_MODE:-}" export GITEA_LOG_ROUTER="${GITEA_LOG_ROUTER:-}" export GITEA_ADMIN_USER="${GITEA_ADMIN_USER:-bn_user}" -export GITEA_ADMIN_PASSWORD="${GITEA_ADMIN_PASSWORD:-bitnami}" +export GITEA_ADMIN_PASSWORD="${GITEA_ADMIN_PASSWORD:-}" export GITEA_ADMIN_EMAIL="${GITEA_ADMIN_EMAIL:-user@bitnami.org}" export GITEA_APP_NAME="${GITEA_APP_NAME:-Gitea: Git with a cup of tea}" export GITEA_RUN_MODE="${GITEA_RUN_MODE:-prod}" @@ -108,7 +108,7 @@ export GITEA_SSH_PORT="${GITEA_SSH_PORT:-${GITEA_SSH_LISTEN_PORT}}" export GITEA_HTTP_PORT="${GITEA_HTTP_PORT:-3000}" export GITEA_PROTOCOL="${GITEA_PROTOCOL:-http}" export GITEA_ROOT_URL="${GITEA_ROOT_URL:-${GITEA_PROTOCOL}://${GITEA_DOMAIN}:${GITEA_HTTP_PORT}}" -export GITEA_PASSWORD_HASH_ALGO="${GITEA_PASSWORD_HASH_ALGO:-pbkdf2}" +export GITEA_PASSWORD_HASH_ALGO="${GITEA_PASSWORD_HASH_ALGO:-pbkdf2_hi}" export GITEA_LFS_START_SERVER="${GITEA_LFS_START_SERVER:-false}" export GITEA_ENABLE_OPENID_SIGNIN="${GITEA_ENABLE_OPENID_SIGNIN:-false}" export GITEA_ENABLE_OPENID_SIGNUP="${GITEA_ENABLE_OPENID_SIGNUP:-false}" diff --git a/bitnami/gitea/1/debian-12/rootfs/opt/bitnami/scripts/gitea/postunpack.sh b/bitnami/gitea/1/debian-12/rootfs/opt/bitnami/scripts/gitea/postunpack.sh index cedbeeba1caa..452c5bec0914 100755 --- a/bitnami/gitea/1/debian-12/rootfs/opt/bitnami/scripts/gitea/postunpack.sh +++ b/bitnami/gitea/1/debian-12/rootfs/opt/bitnami/scripts/gitea/postunpack.sh @@ -36,4 +36,4 @@ done chmod a+x "${GITEA_WORK_DIR}/bin/gitea" render-template "$GITEA_CONF_DIR/app.ini.template" >"$GITEA_CONF_FILE" -configure_permissions_ownership "$GITEA_CONF_FILE" -f "664" -u "$GITEA_DAEMON_USER" -g "root" +configure_permissions_ownership "$GITEA_CONF_FILE" -f "660" -u "$GITEA_DAEMON_USER" -g "root" diff --git a/bitnami/gitea/1/debian-12/rootfs/opt/bitnami/scripts/libgitea.sh b/bitnami/gitea/1/debian-12/rootfs/opt/bitnami/scripts/libgitea.sh index 700150a2511d..9d175b2ffa23 100644 --- a/bitnami/gitea/1/debian-12/rootfs/opt/bitnami/scripts/libgitea.sh +++ b/bitnami/gitea/1/debian-12/rootfs/opt/bitnami/scripts/libgitea.sh @@ -58,6 +58,9 @@ gitea_validate() { fi } + # Validate credentials + check_empty_value "GITEA_ADMIN_PASSWORD" + ! is_empty_value "$GITEA_HTTP_PORT" && check_valid_port "GITEA_HTTP_PORT" ! is_empty_value "$GITEA_SSH_PORT" && check_valid_port "GITEA_SSH_PORT" ! is_empty_value "$GITEA_SSH_LISTEN_PORT" && check_valid_port "GITEA_SSH_LISTEN_PORT" @@ -161,6 +164,7 @@ gitea_initialize() { is_empty_value "$GITEA_ENABLE_OPENID_SIGNIN" || gitea_conf_set "openid" "ENABLE_OPENID_SIGNIN" "$GITEA_ENABLE_OPENID_SIGNIN" is_empty_value "$GITEA_ENABLE_OPENID_SIGNUP" || gitea_conf_set "openid" "ENABLE_OPENID_SIGNUP" "$GITEA_ENABLE_OPENID_SIGNUP" info "Persisting Gitea installation" + chmod 600 "$GITEA_CONF_FILE" persist_app "$app_name" "$GITEA_DATA_TO_PERSIST" else info "Restoring persisted Gitea installation" @@ -258,7 +262,6 @@ gitea_conf_set() { local -r value="${3:?value is required}" local -r file="${4:-${GITEA_CONF_FILE}}" - debug "Setting ${section:+"${section}."}${key} to '${value}' in Gitea configuration" ini-file set --section "$section" --key "$key" --value "$value" "$file" } diff --git a/bitnami/gitea/README.md b/bitnami/gitea/README.md index c62ff6781e5f..77fe585e6467 100644 --- a/bitnami/gitea/README.md +++ b/bitnami/gitea/README.md @@ -78,7 +78,7 @@ The following tables list the main variables you can set. | `GITEA_LOG_MODE` | Gitea log mode. | `nil` | | `GITEA_LOG_ROUTER` | Gitea log router. | `nil` | | `GITEA_ADMIN_USER` | Admin username. | `bn_user` | -| `GITEA_ADMIN_PASSWORD` | Admin password. | `bitnami` | +| `GITEA_ADMIN_PASSWORD` | Admin password. | `nil` | | `GITEA_ADMIN_EMAIL` | Admin user email. | `user@bitnami.org` | | `GITEA_APP_NAME` | Application name, used in the page title | `Gitea: Git with a cup of tea` | | `GITEA_RUN_MODE` | Application run mode, affects performance and debugging. Either "dev", "prod" or "test". | `prod` | @@ -89,7 +89,7 @@ The following tables list the main variables you can set. | `GITEA_HTTP_PORT` | Gitea HTTP listen port | `3000` | | `GITEA_PROTOCOL` | [http, https, fcgi, http+unix, fcgi+unix] | `http` | | `GITEA_ROOT_URL` | Overwrite the automatically generated public URL. This is useful if the internal and the external URL don't match | `${GITEA_PROTOCOL}://${GITEA_DOMAIN}:${GITEA_HTTP_PORT}` | -| `GITEA_PASSWORD_HASH_ALGO` | The hash algorithm to use [argon2, pbkdf2, scrypt, bcrypt], argon2 will spend more memory than others. | `pbkdf2` | +| `GITEA_PASSWORD_HASH_ALGO` | The hash algorithm to use [argon2, pbkdf2, pbkdf2_hi, scrypt, bcrypt], argon2 will spend more memory than others. | `pbkdf2_hi` | | `GITEA_LFS_START_SERVER` | Enables Git LFS support | `false` | | `GITEA_ENABLE_OPENID_SIGNIN` | Enable OpenID sign-in. | `false` | | `GITEA_ENABLE_OPENID_SIGNUP` | Enable OpenID sign-up. | `false` | diff --git a/bitnami/gitea/docker-compose.yml b/bitnami/gitea/docker-compose.yml index b887f1b61066..5d8d01f859c4 100644 --- a/bitnami/gitea/docker-compose.yml +++ b/bitnami/gitea/docker-compose.yml @@ -17,6 +17,7 @@ services: volumes: - 'gitea_data:/bitnami/gitea' environment: + - GITEA_ADMIN_PASSWORD=bitnami - GITEA_DATABASE_HOST=postgresql - GITEA_DATABASE_NAME=bitnami_gitea - GITEA_DATABASE_USERNAME=bn_gitea