diff --git a/.gitlab-version b/.gitlab-version index 4ccd527bb..9b0755f39 100644 --- a/.gitlab-version +++ b/.gitlab-version @@ -1 +1 @@ -17.2.1 \ No newline at end of file +17.3.4 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index fda1c1c50..0a9b043ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/rtxux/gitlab:17.2.1 +FROM sameersbn/gitlab:17.3.4 # Override files COPY assets/runtime/config/gitlabhq/gitlab.yml ${GITLAB_RUNTIME_DIR}/config/gitlabhq/gitlab.yml diff --git a/assets/runtime/functions b/assets/runtime/functions index cef67ec25..5e9789892 100755 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -351,6 +351,10 @@ gitlab_configure_gitaly() { gitlab_configure_monitoring() { echo "Configuring gitlab::monitoring..." + if [ "${GITLAB_MONITORING_IP_WHITELIST}" == "" ]; then + exec_as_git sed -i "/{{GITLAB_MONITORING_IP_WHITELIST}}/d" ${GITLAB_CONFIG} + fi + update_template ${GITLAB_CONFIG} \ GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL \ GITLAB_MONITORING_IP_WHITELIST \ @@ -1832,13 +1836,13 @@ generate_healthcheck_script() { # configure healthcheck script ## https://docs.gitlab.com/ee/user/admin_area/monitoring/health_check.html local HEALTHCHECK_PROTOCOL="http" - if [[ "${GITLAB_HTTPS}" == true ]]; then + if [[ "${GITLAB_HTTPS}" == true && "${SSL_SELF_SIGNED}" == false ]]; then HEALTHCHECK_PROTOCOL="${HEALTHCHECK_PROTOCOL}s" fi cat > /usr/local/sbin/healthcheck <