docker: fix SVN paths and expose option to change log-level

docker-compose-apps.dev.yaml

@@ -1,78 +1,80 b''
 volumes:
   nixstore: {}
   pipcache: {}
   rctmpdir: {}
 
 services:
 
   rhodecode:
     volumes:
       - $WORKSPACE_HOME/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
       - $WORKSPACE_HOME/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
       - $WORKSPACE_HOME/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
       - $WORKSPACE_HOME/rhodecode-tools-ce:/home/rhodecode/rhodecode-tools-ce:delegated
       - $WORKSPACE_HOME:/var/opt/rhodecode_repo_store:delegated
       - nixstore:/opt/nix/store
       - pipcache:/home/rhodecode/.cache/pip
       # shared TMP dir
       - rctmpdir:/tmp
 
     environment:
       RC_APP_PORT: "8080"
 
   vcsserver:
     volumes:
       - $WORKSPACE_HOME/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
       - $WORKSPACE_HOME/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
       - $WORKSPACE_HOME/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
       - $WORKSPACE_HOME/rhodecode-tools-ce:/home/rhodecode/rhodecode-tools-ce:delegated
       - $WORKSPACE_HOME:/var/opt/rhodecode_repo_store:delegated
       - nixstore:/opt/nix/store
       - pipcache:/home/rhodecode/.cache/pip
       # shared TMP dir
       - rctmpdir:/tmp
 
     environment:
       RC_APP_PORT: "8080"
 
   celery:
     volumes:
       - $WORKSPACE_HOME/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
       - $WORKSPACE_HOME/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
       - $WORKSPACE_HOME/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
       - nixstore:/opt/nix/store
       - pipcache:/home/rhodecode/.cache/pip
       # shared TMP dir
       - rctmpdir:/tmp
 
   celery-beat:
     volumes:
       - $WORKSPACE_HOME/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
       - $WORKSPACE_HOME/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
       - $WORKSPACE_HOME/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
       - nixstore:/opt/nix/store
       - pipcache:/home/rhodecode/.cache/pip
       # shared TMP dir
       - rctmpdir:/tmp
 
   svn:
     volumes:
       - $WORKSPACE_HOME/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
       - $WORKSPACE_HOME/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
       - $WORKSPACE_HOME/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
       - $WORKSPACE_HOME:/var/opt/rhodecode_repo_store:delegated
       - nixstore:/opt/nix/store
       - pipcache:/home/rhodecode/.cache/pip
       # shared TMP dir
       - rctmpdir:/tmp
+      # config override
+      - $PWD/service/svn/virtualhost.conf:/home/rhodecode/apache2/conf/virtualhost.conf
 
   sshd:
     volumes:
       - $WORKSPACE_HOME/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
       - $WORKSPACE_HOME/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
       - $WORKSPACE_HOME/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
       - $WORKSPACE_HOME:/var/opt/rhodecode_repo_store:delegated
       - nixstore:/opt/nix/store
       - pipcache:/home/rhodecode/.cache/pip
       # shared TMP dir
       - rctmpdir:/tmp

docker-compose-apps.yaml

@@ -1,302 +1,304 b''
 version: '3.9'
 
 x-logging: &custom-logging
   # docker plugin install grafana/loki-docker-driver:2.7.1 --alias loki --grant-all-permissions
   # NOTE: loki logging driver ONLY works for host type networks...
   driver: loki
   options:
     #loki-url: "http://${RC_LOKI_AUTH}loki:3100/loki/api/v1/push"
     loki-url: "http://${RC_LOKI_AUTH}127.0.0.1:3100/loki/api/v1/push"
     loki-retries: "5"
     loki-timeout: "1s"
     loki-max-backoff: "800ms"
 
 
 services:
 
   # base shared options for RhodeCode type services
   common_base:
     image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}
     stdin_open: true
     tty: true
     restart: always
     deploy:
       # override this in .custom/docker-compose-apps.override.yaml to scale up
       replicas: 0
     networks:
       - rhodecode_network
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
       - confvolume:/etc/rhodecode/conf
       - rc_reposvolume:/var/opt/rhodecode_repo_store
       - rc_datavolume:/var/opt/rhodecode_data
     logging:
       *custom-logging
 
   # base definition WITHOUT labels to full control over override and custom service
   # main rhodecode will use extends + service from that base
   rhodecode_base:
     extends:
       service: common_base
 
     env_file:
         - ${RC_ENV_FILE:?must-specify-rc-env-file}
 
     command: [
       "/usr/local/bin/rhodecode_bin/bin/gunicorn",
       "--error-logfile=-",
       "--paster=/etc/rhodecode/conf/rhodecode.ini",
       "--config=/etc/rhodecode/conf/gunicorn_conf_rc.py"
     ]
 
     build:
       context: .
       dockerfile: service/rhodecode/rhodecode.dockerfile
       args:
         TZ: ${TZ:-UTC}
         RHODECODE_VERSION: ${RC_VERSION:-4.28.0}
         RHODECODE_DB: postgresql://rhodecode:${DB_PASSWORD:?must-specify-db-password}@database/${DB_NAME:?must-specify-db-name}
         RHODECODE_USER_NAME: ${RHODECODE_USER_NAME}
         RHODECODE_USER_PASS: ${RHODECODE_USER_PASS}
         RHODECODE_USER_EMAIL: ${RHODECODE_USER_EMAIL}
 
     environment:
       RC_APP_TYPE: rhodecode_http
       RC_APP_PROC: 1
       RC_APP_PORT: "10020"
       SSL_CERT_FILE: "/etc/rhodecode/conf/ca-bundle.crt"
       REQUESTS_CA_BUNDLE: "/etc/rhodecode/conf/ca-bundle.crt"
       GIT_SSL_CAINFO: "/etc/rhodecode/conf/ca-bundle.crt"
       GEVENT_RESOLVER: "ares"
       GUNICORN_CMD_ARGS: "--bind=0.0.0.0:10020 --name=gunicorn-rhodecode-1 --workers=2"
 
       DB_UPGRADE: 1  # run the DB upgrade
       SETUP_APP: 1 # run the application default settings setup, can be turned off after initial run
       #FORCE_DB_INIT_FILE: 1 # force the database init, warning: destroys old DB
       #FORCE_RC_SETUP_APP: 1 # force running setup scripts for configuration/license application
       MAIN_INI_PATH: /etc/rhodecode/conf/rhodecode.ini
 
       # SVN Specific
       MOD_DAV_SVN_PORT: 8090
+      MOD_DAV_SVN_LOG_LEVEL: info
       APACHE_LOG_DIR: /var/log
       MOD_DAV_SVN_CONF_FILE: /etc/rhodecode/conf/svn/mod_dav_svn.conf
 
     healthcheck:
       test: curl -A RhodeCode-Healthcheck -s -o /dev/null -w '%{http_code}' http://127.0.0.1:$${RC_APP_PORT}/_admin/ops/ping
       timeout: 30s
       interval: 60s
       retries: 10
 
     tmpfs:
       - /data_ramdisk:size=${RC_DATA_RAMDISK_SIZE:-256M}
 
   rhodecode:
 #    depends_on:
 #      - redis
 #      - database
 #      - channelstream
 #    ports:
 #      - "127.0.0.1::10020"
     extends:
       service: rhodecode_base
 
     deploy:
       # override this in .custom/docker-compose-apps.override.yaml to scale up
       # replicas of rhodecode and vcsserver should be equal in most cases
       replicas: 1
 
     volumes:
       - ./.custom/static_files:/var/opt/rhodecode_static_data
 
     labels:
       - "autoheal=true"
       - "traefik.enable=true"
       - "traefik.http.routers.rhodecode.entrypoints=http"
       - "traefik.http.routers.rhodecode.priority=10"
       - "traefik.http.routers.rhodecode.rule=Host(`${RC_HOSTNAME:?must-specify-rhodecode-hostname}`)"
       - "traefik.http.routers.rhodecode.service=rhodecode-web"
       - "traefik.http.services.rhodecode-web.loadbalancer.server.port=10020"
       # HTTP + SSL example, should be put into .custom/docker-compose-apps.override.yaml
       #- "traefik.http.routers.rhodecode.entrypoints=http,https"
 
   vcsserver:
 #    depends_on:
 #      - redis
 #    ports:
 #      - "127.0.0.1::10010"
     extends:
       service: common_base
     env_file:
         - ${RC_ENV_FILE:?must-specify-rc-env-file}
     command: [
        "/usr/local/bin/rhodecode_bin/vcs_bin/gunicorn",
        "--error-logfile=-",
        "--paster=/etc/rhodecode/conf/vcsserver.ini",
        "--config=/etc/rhodecode/conf/gunicorn_conf_vcs.py"
     ]
     deploy:
       # override this in .custom/docker-compose-apps.override.yaml to scale up
       # replicas of rhodecode and vcsserver should be equal in most cases
       replicas: 1
     environment:
       RC_APP_TYPE: rhodecode_vcsserver
       RC_APP_PROC: 1
       RC_APP_PORT: "10010"
       MAIN_INI_PATH: /etc/rhodecode/conf/vcsserver.ini
       SSL_CERT_FILE: "/etc/rhodecode/conf/ca-bundle.crt"
       REQUESTS_CA_BUNDLE: "/etc/rhodecode/conf/ca-bundle.crt"
       GIT_SSL_CAINFO: "/etc/rhodecode/conf/ca-bundle.crt"
       GUNICORN_CMD_ARGS: "--bind=0.0.0.0:10010 --name=gunicorn-vcsserver-1 --workers=3"
 
     healthcheck:
       test: curl -A RhodeCode-Healthcheck -s -o /dev/null -w '%{http_code}' http://127.0.0.1:$${RC_APP_PORT}/status
       timeout: 30s
       start_period: 5s
       interval: 60s
       retries: 10
     labels:
       - "autoheal=true"
 
   celery:
     extends:
       service: common_base
 #    depends_on:
 #      - database
 #      - redis
     env_file:
         - ${RC_ENV_FILE:?must-specify-rc-env-file}
     command: [
         "/usr/local/bin/rhodecode_bin/bin/celery",
         "--no-color",
         "--app=rhodecode.lib.celerylib.loader",
         "worker",
         "--autoscale=20,2",
         "--task-events",
         "--loglevel=DEBUG",
         "--ini=/etc/rhodecode/conf/rhodecode.ini"
     ]
     deploy:
       # override this in .custom/docker-compose-apps.override.yaml to scale up
       replicas: 1
     environment:
       RC_APP_TYPE: rhodecode_celery
       RC_APP_PROC: 1
       MAIN_INI_PATH: /etc/rhodecode/conf/rhodecode.ini
       SSL_CERT_FILE: "/etc/rhodecode/conf/ca-bundle.crt"
       REQUESTS_CA_BUNDLE: "/etc/rhodecode/conf/ca-bundle.crt"
       GIT_SSL_CAINFO: "/etc/rhodecode/conf/ca-bundle.crt"
     labels:
       - "autoheal=true"
 
   celery-beat:
     extends:
       service: common_base
 #    depends_on:
 #      - database
 #      - redis
     env_file:
         - ${RC_ENV_FILE:?must-specify-rc-env-file}
     command: [
       "/usr/local/bin/rhodecode_bin/bin/celery",
       "--no-color",
       "--app=rhodecode.lib.celerylib.loader",
       "beat",
       "--scheduler=rhodecode.lib.celerylib.scheduler.RcScheduler",
       "--loglevel=DEBUG",
       "--ini=/etc/rhodecode/conf/rhodecode.ini"
     ]
     deploy:
       # override this in .custom/docker-compose-apps.override.yaml to scale up
       replicas: 1
     environment:
       RC_APP_TYPE: rhodecode_beat
       RC_APP_PROC: 1
       MAIN_INI_PATH: /etc/rhodecode/conf/rhodecode.ini
       SSL_CERT_FILE: "/etc/rhodecode/conf/ca-bundle.crt"
       REQUESTS_CA_BUNDLE: "/etc/rhodecode/conf/ca-bundle.crt"
       GIT_SSL_CAINFO: "/etc/rhodecode/conf/ca-bundle.crt"
     labels:
       - "autoheal=true"
 
   svn:
     extends:
       service: common_base
 #    depends_on:
 #      - database
 #      - redis
 
 #    build:
 #      context: .
 #      dockerfile: service/svn/rhodecode_svn.dockerfile
 #      args:
 #        APACHE_VER: 1.3
 
     env_file:
         - ${RC_ENV_FILE:?must-specify-rc-env-file}
     command: [
         "apachectl",
         "-D",
         "FOREGROUND"
     ]
     deploy:
       # override this in .custom/docker-compose-apps.override.yaml to scale up
       replicas: 1
     environment:
       RC_APP_TYPE: rhodecode_svn
 
       # SVN Specific
       MOD_DAV_SVN_PORT: 8090
+      MOD_DAV_SVN_LOG_LEVEL: info
       APACHE_LOG_DIR: /var/log
       MOD_DAV_SVN_CONF_FILE: /etc/rhodecode/conf/svn/mod_dav_svn.conf
-      MOD_DAV_CORE_MODULES_DIR: /usr/lib/apache2/modules
-      MOD_DAV_SVN_MODULE: /usr/lib/apache2/modules/mod_dav_svn.so
+      MOD_DAV_CORE_MODULES_DIR: /home/rhodecode/apache2/modules/
+      MOD_DAV_SVN_MODULE: /home/rhodecode/apache2/modules/mod_dav.so
 
     healthcheck:
       test: curl -A RhodeCode-Healthcheck -s -o /dev/null -w '%{http_code}' http://127.0.0.1:$${MOD_DAV_SVN_PORT}/_server_status
       timeout: 30s
       interval: 60s
       retries: 10
 #    ports:
 #      - "127.0.0.1::8090"
     labels:
       - "autoheal=true"
 
   sshd:
     extends:
       service: common_base
 #    depends_on:
 #      - database
 #      - redis
     env_file:
         - ${RC_ENV_FILE:?must-specify-rc-env-file}
     command: [
         "/usr/sbin/sshd",
         "-f",
         "/etc/rhodecode/sshd_config",
         "-D",
         "-e"
     ]
     deploy:
       # override this in .custom/docker-compose-apps.override.yaml to scale up
       replicas: 1
     environment:
       RC_APP_TYPE: rhodecode_sshd
       SSH_BOOTSTRAP: 1
       SSH_ENSURE_PERMS: 1
     healthcheck:
       # we call ssh internally, to find permission denied, if SSH is DOWN it would be connection refused
       test: /usr/bin/ssh -p22 -o StrictHostKeyChecking=no -o PasswordAuthentication=No rhodecode@localhost true 2>&1 | grep -c 'Permission denied' > /dev/null
       timeout: 30s
       interval: 60s
       retries: 10
 #    ports:
 #      # 9022 is set from .env file too.
 #      - "9022:22"
     labels:
       - "autoheal=true"
       - "traefik.enable=true"
       - "traefik.tcp.routers.sshd.entrypoints=ssh"
       - "traefik.tcp.routers.sshd.rule=HostSNI(`*`)"
       - "traefik.tcp.routers.sshd.service=rhodecode-ssh"
       - "traefik.tcp.services.rhodecode-ssh.loadbalancer.server.port=22"

service/rhodecode/rhodecode.dockerfile

@@ -1,298 +1,299 b''
 # binary-install
 FROM ubuntu:22.04
 # Using 22.04 LTS Release
 MAINTAINER RhodeCode Inc. <[e-mail]>
 
 ARG TZ="UTC"
 ARG LOCALE_TYPE=en_US.UTF-8
 ARG RHODECODE_TYPE=Enterprise
 
 ARG RHODECODE_VERSION=4.28.0
 
 ARG RHODECODE_DB=sqlite
 ARG RHODECODE_USER_NAME=admin
 ARG RHODECODE_USER_PASS=secret4
 ARG RHODECODE_USER_EMAIL=[e-mail]
 
 # nix ver/channels
 ARG DEV_NIX_VERSION=2.0.4
 ARG DEV_NIX_CHANNEL=nixos-18.03
 
 # env are runtime
 ENV \
     TZ=${TZ} \
     LOCALE_TYPE=${LOCALE_TYPE} \
     \
     ## Define type we build, and the instance we'll create
     RHODECODE_TYPE=${RHODECODE_TYPE} \
     RC_TYPE_ID=enterprise-1 \
     \
     ## SETUP ARGS FOR INSTALLATION ##
     ## set version we build on, get from .env or set default ver
     RHODECODE_VERSION=${RHODECODE_VERSION} \
     \
     ## set DB, default sqlite
     RHODECODE_DB=${RHODECODE_DB} \
     \
     ## set app bootstrap required data
     RHODECODE_USER_NAME=${RHODECODE_USER_NAME} \
     RHODECODE_USER_PASS=${RHODECODE_USER_PASS} \
     RHODECODE_USER_EMAIL=${RHODECODE_USER_EMAIL} \
     \
     RC_USER=rhodecode \
     \
     # SVN CONFIG
     MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \
     MOD_DAV_SVN_PORT=8090 \
+    MOD_DAV_SVN_LOG_LEVEL=info \
     \
     # SSHD CONFIG
     SSHD_CONF_FILE=/etc/rhodecode/sshd_config \
     \
     SHARED_CONF_DIR=/etc/rhodecode/conf \
     BUILD_CONF=/etc/rhodecode/conf_build \
     BUILD_BIN_DIR=/usr/local/bin/rhodecode_bin \
     RHODECODE_DATA_DIR=/var/opt/rhodecode_data \
     RHODECODE_REPO_DIR=/var/opt/rhodecode_repo_store \
     RHODECODE_HTTP_PORT=10020 \
     RHODECODE_VCS_PORT=10010 \
     RHODECODE_HOST=0.0.0.0 \
     RHODECODE_VCS_HOST=127.0.0.1
 
 ENV \
     RCCONTROL=/home/$RC_USER/.rccontrol-profile/bin/rccontrol \
     SUPERVISOR_CONF=/home/$RC_USER/.rccontrol/supervisor/supervisord.ini \
     # make application scripts visible
     PATH=$PATH:/home/$RC_USER/.rccontrol-profile/bin
 
 ENV SVN_LOCALE_DEPS apache2 apache2-utils libapache2-mod-svn
 ENV SSH_LOCALE_DEPS openssh-server
 ENV PYTHON_DEPS python2
 ENV EXTRA_DEPS ""
 
 ENV \
     NIX_BLD_USER=nixbld \
     NIX_PATH=/nix/var/nix/profiles/per-user/$RC_USER/channels \
     NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt \
     PATH=$PATH:/nix/var/nix/profiles/per-user/$RC_USER/profile/bin:/home/$RC_USER/rhodecode-enterprise-ee/profile/bin
 
 RUN \
 echo "** install base packages **" && \
 set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update; \
 	DEBIAN_FRONTEND="noninteractive" \
 	apt-get install -y --no-install-recommends \
         tini \
         bash \
         binutils \
         tzdata \
         locales \
         openssl \
         curl \
         sudo \
         gosu \
         bzip2 \
         ca-certificates \
         $PYTHON_DEPS \
         $SSH_LOCALE_DEPS \
         $SVN_LOCALE_DEPS \
         $EXTRA_DEPS \
 	; \
 	rm -rf /var/lib/apt/lists/*;
 
 RUN \
 echo "** Configure the python executable for py2/3 compat **" && \
 IS_PY=$(which python3 || which python2) && \
 if [ -n $IS_PY ] ; then ln -s $IS_PY /usr/bin/python ; fi
 
 RUN \
 echo "** Configure the locales **" && \
     sed -i "s/^# ${LOCALE_TYPE}/${LOCALE_TYPE}/g" /etc/locale.gen && \
     locale-gen
 
 # locale-archive is a fix for old nix glibc2.26 locales available
 ENV \
     LOCALE_ARCHIVE=/var/opt/locale-archive \
     LANG=${LOCALE_TYPE} \
     LANGUAGE=${LOCALE_TYPE} \
     LC_ALL=${LOCALE_TYPE}
 
 # configure the system user
 # explicitly set uid/gid to guarantee that it won't change in the future
 # the values 999:999 are identical to the current user/group id assigned
 RUN \
 echo "** Create system user $RC_USER **" && \
   groupadd --system --gid 999 $RC_USER && \
   useradd --system --gid $RC_USER --uid 999 --shell /bin/bash $RC_USER && \
   usermod -G $RC_USER $RC_USER
 
 RUN \
 echo "** Create nix-build user $NIX_BLD_USER **" && \
     groupadd --system --gid 1099 $NIX_BLD_USER && \
     useradd --system --gid $NIX_BLD_USER --uid 1099 --shell /bin/bash $NIX_BLD_USER && \
     usermod -G $NIX_BLD_USER $NIX_BLD_USER
 
 RUN \
 echo "** disable nix sandboxing **" && \
     mkdir /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf
 
 
 # set the defult bash shell
 SHELL ["/bin/bash", "-c"]
 
 # Fix and set a timezone
 RUN \
 echo "** configure the timezone **" && \
 rm /etc/localtime && cp /usr/share/zoneinfo/$TZ /etc/localtime && \
 echo $TZ > /etc/timezone
 
 
 RUN \
 echo "** prepare rhodecode store and cache **" && \
   install -d -m 0700 -o $RC_USER -g $RC_USER /nix && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /opt/rhodecode && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /usr/local/bin/rhodecode_bin && \
   install -d -m 0755 -o $RC_USER -g $RC_USER $RHODECODE_REPO_DIR && \
   install -d -m 0755 -o $RC_USER -g $RC_USER $RHODECODE_DATA_DIR && \
   install -d -m 0755 -o $RC_USER -g $RC_USER $BUILD_CONF && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/rhodecode-vcsserver && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/rhodecode-enterprise-ce && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/rhodecode-enterprise-ee && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/ && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol/cache && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol/bootstrap && \
   install -d -m 0700 -o $RC_USER -g $RC_USER /home/$RC_USER/.ssh && \
   install -d -m 0700 -o $RC_USER -g $RC_USER /home/$RC_USER/.rhoderc
 
 # expose our custom sshd config
 COPY service/sshd/sshd_config $SSHD_CONF_FILE
 
 # Apache SVN setup
 RUN \
     echo "**** Apache config cleanup ****" && \
     rm -f /etc/apache2/conf.d/info.conf \
           /etc/apache2/conf.d/mpm.conf \
           /etc/apache2/conf.d/userdir.conf && \
     rm -f /etc/apache2/sites-enabled/* && \
     rm -f /etc/apache2/sites-available/*
 
 # custom SVN virtualhost
 COPY service/svn/virtualhost.conf /etc/apache2/sites-enabled/
 
 RUN \
 echo "**** Apache config ****" && \
     echo $(strings /usr/lib/apache2/modules/mod_dav_svn.so | grep 'Powered by') > /var/opt/dav.version && \
     mkdir -p /run/apache2 && \
     mkdir -p /var/opt/www && \
     echo "unset HOME" > /etc/apache2/envvars && \
     echo "export APACHE_RUN_USER=${RC_USER}" >> /etc/apache2/envvars && \
     echo "export APACHE_PID_FILE=/var/run/apache2/apache2.pid" >> /etc/apache2/envvars && \
     echo "export APACHE_RUN_DIR=/var/run/apache2" >> /etc/apache2/envvars && \
     echo "export APACHE_LOCK_DIR=/var/lock/apache2" >> /etc/apache2/envvars && \
     echo "export APACHE_RUN_USER=${RC_USER}" >> /etc/apache2/envvars && \
     echo "export APACHE_RUN_GROUP=${RC_USER}" >> /etc/apache2/envvars && \
     sed -i "s/Listen 80/Listen ${MOD_DAV_SVN_PORT}/g" /etc/apache2/ports.conf
 
 
 # Copy artifacts
 
 COPY --chown=$RC_USER:$RC_USER .cache/locale-archive /var/opt/
 COPY --chown=$RC_USER:$RC_USER .cache/RhodeCode* /home/$RC_USER/.rccontrol/cache/
 COPY --chown=$RC_USER:$RC_USER config/_shared/rhodecode_enterprise.license /home/$RC_USER/.rccontrol/bootstrap/
 COPY --chown=$RC_USER:$RC_USER service/rhodecode/bootstrap/* /home/$RC_USER/.rccontrol/bootstrap/
 #COPY --chown=$RC_USER:$RC_USER .source/ /home/$RC_USER/
 
 
 #RUN \
 #echo "** prepare rhodecode dirs **" && \
 #  install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol/vcsserver-1 && \
 #  install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol/community-1 && \
 #  install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol/enterprise-1 && \
 #  echo "Done rhodecode dirs"
 
 # change to non-root user for RUN commands
 USER $RC_USER
 WORKDIR /home/$RC_USER
 
 RUN \
 echo "** install rhodecode control **" && \
   cd /home/$RC_USER/.rccontrol/cache && \
   INSTALLER=$(ls -Art /home/$RC_USER/.rccontrol/cache/RhodeCode-installer-* | tail -n 1) && \
   chmod +x ${INSTALLER} && \
   ${INSTALLER} --accept-license && \
   ${RCCONTROL} self-init && \
   cp -v /home/$RC_USER/.rccontrol-profile/etc/ca-bundle.crt $BUILD_CONF/ && \
   echo "Done installing rhodecode control"
 
 RUN \
 echo "** install vcsserver ${RHODECODE_VERSION} **" && \
   ${RCCONTROL} install VCSServer --version ${RHODECODE_VERSION} --start-at-boot=yes --accept-license --offline \
   '{"host":"'"$RHODECODE_VCS_HOST"'", "port":"'"$RHODECODE_VCS_PORT"'"}' && \
   VCSSERVER_PATH=/home/$RC_USER/.rccontrol/vcsserver-1 && \
   rm -rf $BUILD_BIN_DIR/vcs_bin && \
   ln -s ${VCSSERVER_PATH}/profile/bin $BUILD_BIN_DIR/vcs_bin && \
   cp -v ${VCSSERVER_PATH}/vcsserver.ini $BUILD_CONF/vcsserver.ini && \
   cp -v ${VCSSERVER_PATH}/gunicorn_conf.py $BUILD_CONF/gunicorn_conf_vcs.py && \
   echo "Done installing vcsserver"
 
 RUN \
 echo "** install rhodecode ${RHODECODE_TYPE} ${RHODECODE_VERSION} **" && \
   RHODECODE_DB_INIT=sqlite && \
   ${RCCONTROL} install ${RHODECODE_TYPE} --version ${RHODECODE_VERSION} --start-at-boot=yes --accept-license --offline \
   '{"host":"'"$RHODECODE_HOST"'", "port":"'"$RHODECODE_HTTP_PORT"'", "username":"'"$RHODECODE_USER_NAME"'", "password":"'"$RHODECODE_USER_PASS"'", "email":"'"$RHODECODE_USER_EMAIL"'", "repo_dir":"'"$RHODECODE_REPO_DIR"'", "database": "'"$RHODECODE_DB_INIT"'", "skip_existing_db": "1"}' && \
   RHODECODE_PATH=/home/$RC_USER/.rccontrol/${RC_TYPE_ID} && \
   rm -rf $BUILD_BIN_DIR/bin && ln -s ${RHODECODE_PATH}/profile/bin $BUILD_BIN_DIR/ && \
   cp -v ${RHODECODE_PATH}/rhodecode.ini $BUILD_CONF/rhodecode.ini && \
   cp -v ${RHODECODE_PATH}/gunicorn_conf.py $BUILD_CONF/gunicorn_conf_rc.py && \
   cp -v ${RHODECODE_PATH}/search_mapping.ini $BUILD_CONF/search_mapping.ini && \
   mkdir -p $RHODECODE_DATA_DIR/static && cp -r ${RHODECODE_PATH}/public/* $RHODECODE_DATA_DIR/static/ && \
   rm ${RHODECODE_PATH}/rhodecode.db && \
   echo "Done installing rhodecode"
 
 
 RUN \
 echo "** configure supervisord **" && \
   cp -v ${SUPERVISOR_CONF} $BUILD_CONF/ && \
   sed -i "s/self_managed_supervisor = False/self_managed_supervisor = True/g" /home/$RC_USER/.rccontrol.ini && \
   echo "Done installing supervisord"
 
 USER root
 
 RUN \
 echo "**** cleanup ****" && \
     apt-get remove -y $PYTHON_DEPS && \
     apt-get autoclean -y && \
     rm -f /tmp/* && \
     rm -f /home/$RC_USER/.rccontrol/cache/RhodeCode-* && \
     rm -rf /var/lib/apt/lists/* && \
     rm -rf /var/cache/apk/* && \
     rm -f ${SUPERVISOR_CONF} && \
     echo "Done cleanup"
 
 #RUN \
 #echo "**** cleanup source ****" && \
 #    rm -rf /home/$RC_USER/rhodecode-vcsserver && \
 #    rm -rf /home/$RC_USER/rhodecode-enterprise-ce && \
 #    rm -rf /home/$RC_USER/rhodecode-enterprise-ee && \
 #    echo "Done cleanup source"
 
 # copy entrypoints
 COPY entrypoints.d/entrypoint.sh /opt/entrypoints.d/entrypoint.sh
 
 RUN chmod +x /opt/entrypoints.d/entrypoint.sh
 
 # config volume
 VOLUME /etc/rhodecode/conf
 
 # repo store volume
 VOLUME /var/opt/rhodecode_repo_store
 
 # data volume
 VOLUME /var/opt/rhodecode_data
 
 ENTRYPOINT ["/opt/entrypoints.d/entrypoint.sh"]
 
 # compose can override this
 CMD [ "$BUILD_BIN_DIR/bin/gunicorn", "--error-logfile=-", "--paster=/etc/rhodecode/conf_build/rhodecode.ini", "--config=/etc/rhodecode/conf_build/gunicorn_conf_rc.py" ]

service/rhodecode/rhodecode_5.dockerfile

@@ -1,444 +1,448 b''
 # virtualenv-install
 
 FROM ubuntu:22.04
 # Using 22.04 LTS Release
 
 ARG TZ="UTC"
 ARG LOCALE_TYPE=en_US.UTF-8
 ARG RHODECODE_TYPE=Enterprise
 
 ARG RHODECODE_VERSION=5.0.0
 
 ARG RHODECODE_DB=sqlite
 ARG RHODECODE_USER_NAME=admin
 ARG RHODECODE_USER_PASS=secret4
 ARG RHODECODE_USER_EMAIL=[e-mail]
 
 # env are runtime
 ENV \
     TZ=${TZ} \
     LOCALE_TYPE=${LOCALE_TYPE} \
     \
     ## Define type we build, and the instance we'll create
     RHODECODE_TYPE=${RHODECODE_TYPE} \
     RC_TYPE_ID=enterprise-1 \
     \
     ## SETUP ARGS FOR INSTALLATION ##
     ## set version we build on, get from .env or set default ver
     RHODECODE_VERSION=${RHODECODE_VERSION} \
     \
     ## set DB, default sqlite
     RHODECODE_DB=${RHODECODE_DB} \
     \
     ## set app bootstrap required data
     RHODECODE_USER_NAME=${RHODECODE_USER_NAME} \
     RHODECODE_USER_PASS=${RHODECODE_USER_PASS} \
     RHODECODE_USER_EMAIL=${RHODECODE_USER_EMAIL} \
     \
     RC_USER=rhodecode \
     \
     # SVN CONFIG
     MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \
     MOD_DAV_SVN_PORT=8090 \
+    MOD_DAV_SVN_LOG_LEVEL=info \
     MOD_DAV_CORE_MODULES_DIR=/home/$RC_USER/apache2/modules \
     MOD_DAV_SVN_MODULE=/home/rhodecode/subversion/libexec/mod_dav_svn.so \
     \
     # SSHD CONFIG
     SSHD_CONF_FILE=/etc/rhodecode/sshd_config \
     \
     SHARED_CONF_DIR=/etc/rhodecode/conf \
     BUILD_CONF=/etc/rhodecode/conf_build \
     BUILD_BIN_DIR=/usr/local/bin/rhodecode_bin \
     RHODECODE_STATIC_DIR=/var/opt/rhodecode_static \
     RHODECODE_DATA_DIR=/var/opt/rhodecode_data \
     RHODECODE_REPO_DIR=/var/opt/rhodecode_repo_store \
     RHODECODE_HTTP_PORT=10020 \
     RHODECODE_VCS_PORT=10010 \
     RHODECODE_HOST=0.0.0.0 \
     RHODECODE_VCS_HOST=127.0.0.1
 
 
 ENV SSH_DEPS \
     openssh-server
 
 ENV SVN_DEPS \
     ""
 
 ENV SVN_DEV_DEPS \
      libtool automake autoconf libapr1-dev libaprutil1-dev libdb5.3-dev liblz4-dev libpcre3-dev \
      libperl-dev libserf-dev libneon27-gnutls-dev libutf8proc-dev py3c-dev gettext tcl-dev
 
 ENV PYTHON_DEPS \
     python3.11
 ENV PYTHON_DEV_DEPS \
     python3.11-dev build-essential libpq-dev libmysqlclient-dev libxmlsec1-dev libxml2-dev libsqlite3-dev \
     liblzma-dev libzmq3-dev libldap2-dev libsasl2-dev libcurl4-openssl-dev libssl-dev libxslt-dev
 
 ENV EXTRA_DEPS \
     vim pkg-config openssl libbz2-1.0 libbz2-dev sqlite3 cpanminus libapr1
 
 # define which deps from the above should be removed in cleanup phase
 ENV CLEANUP_DEPS \
     $PYTHON_DEV_DEPS $SVN_DEV_DEPS
 ENV CLEANUP_DEPS ""
 
 RUN \
 echo "** install base packages **" && \
 set -eux; \
     apt-get update; \
     apt-get install -y ca-certificates curl openssl gpg; \
     curl -fsSL https://keyserver.ubuntu.com/pks/lookup\?op\=get\&search\=0xba6932366a755776 | gpg --dearmor -o /usr/share/keyrings/python-3.gpg; \
     echo "deb [signed-by=/usr/share/keyrings/python-3.gpg] https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu jammy main" >> /etc/apt/sources.list; \
     echo "deb-src [signed-by=/usr/share/keyrings/python-3.gpg] https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu jammy main" >> /etc/apt/sources.list; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update; \
 	DEBIAN_FRONTEND="noninteractive" \
 	apt-get install -y --no-install-recommends \
         tini \
         bash \
         binutils \
         tzdata \
         locales \
         openssl \
         curl \
         sudo \
         gosu \
         bzip2 unzip \
         $PYTHON_DEPS $PYTHON_DEV_DEPS\
         $SSH_DEPS \
         $SVN_DEPS $SVN_DEV_DEPS\
         $EXTRA_DEPS \
 	; \
 	rm -rf /var/lib/apt/lists/*;
 
 RUN \
 echo "** Configure the locales **" && \
     sed -i "s/^# ${LOCALE_TYPE}/${LOCALE_TYPE}/g" /etc/locale.gen && \
     locale-gen
 
 # locale-archive is a fix for old nix glibc2.26 locales available
 ENV \
     #LOCALE_ARCHIVE=/var/opt/locale-archive \
     LANG=${LOCALE_TYPE} \
     LANGUAGE=${LOCALE_TYPE} \
     LC_ALL=${LOCALE_TYPE}
 
 # configure the system user
 # explicitly set uid/gid to guarantee that it won't change in the future
 # the values 999:999 are identical to the current user/group id assigned
 RUN \
 echo "** Create system user $RC_USER **" && \
   groupadd --system --gid 999 $RC_USER && \
   useradd --system --gid $RC_USER --uid 999 --shell /bin/bash $RC_USER && \
   usermod -G $RC_USER $RC_USER
 
 #  Add new user docker to sudo group
 RUN \
   adduser $RC_USER sudo
 
 # Ensure sudo group users are not
 # asked for a password when using
 # sudo command by ammending sudoers file
 RUN \
   echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
 # set the defult bash shell
 SHELL ["/bin/bash", "-c"]
 
 # Fix and set a timezone
 RUN \
   echo "** configure the timezone **" && \
   rm /etc/localtime && cp /usr/share/zoneinfo/$TZ /etc/localtime && \
   echo $TZ > /etc/timezone
 
 
 RUN \
   echo "** prepare rhodecode store and cache **" && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /opt/rhodecode && \
   install -d -m 0700 -o $RC_USER -g $RC_USER /home/$RC_USER/venv && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /usr/local/bin/rhodecode_bin && \
   install -d -m 0755 -o $RC_USER -g $RC_USER $RHODECODE_STATIC_DIR && \
   install -d -m 0755 -o $RC_USER -g $RC_USER $RHODECODE_REPO_DIR && \
   install -d -m 0755 -o $RC_USER -g $RC_USER $RHODECODE_DATA_DIR && \
   install -d -m 0755 -o $RC_USER -g $RC_USER $BUILD_CONF && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/rhodecode-vcsserver && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/rhodecode-enterprise-ce && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/rhodecode-enterprise-ee && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/ && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol/cache && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol/bootstrap && \
   install -d -m 0700 -o $RC_USER -g $RC_USER /home/$RC_USER/.ssh
 
 RUN \
   echo 'export PS1=">> rhodecode-docker-$RHODECODE_VERSION \W \$ "' >> /root/.bash_profile && \
   echo 'export PS1=">> rhodecode-docker-$RHODECODE_VERSION \W \$ "' >> /home/$RC_USER/.bash_profile
 
 # expose our custom sshd config
 COPY service/sshd/sshd_config $SSHD_CONF_FILE
 
 # change to non-root user for RUN commands
 USER $RC_USER
 WORKDIR /home/$RC_USER
 
 ENV \
     VENV_PATH=/home/$RC_USER/venv
 
 ENV \
     PYTHON_VERSION=python3.11 \
     PYTHON_EXECUTABLE=/usr/bin/python3.11 \
     PYTHON=$VENV_PATH/bin/python3.11 \
     PIP_EXECUTABLE=$VENV_PATH/bin/pip \
     # make venv application scripts visible
     PATH=$VENV_PATH/bin:/home/$RC_USER/.local/bin:$PATH
 
 RUN \
    echo "** get pip **" && \
    curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
    $PYTHON_EXECUTABLE get-pip.py \
       --disable-pip-version-check \
       --no-cache-dir \
       --no-compile  \
       "pip==23.2.1" && \
    rm get-pip.py
 
 RUN \
   /home/$RC_USER/.local/bin/pip install --user virtualenv
 
 RUN \
   /home/$RC_USER/.local/bin/virtualenv --python="$PYTHON_EXECUTABLE" $VENV_PATH && \
   /home/$RC_USER/.local/bin/pip install --upgrade pip
 
 # swig install
 ENV \
     RC_SWIG_VERSION=3.0.12 \
     PATH=/usr/local/bin/:$PATH
 
 RUN \
    echo "** install swig packages $RC_SWIG_VERSION **" && \
    curl -L https://sourceforge.net/projects/swig/files/swig/swig-$RC_SWIG_VERSION/swig-$RC_SWIG_VERSION.tar.gz/download -o swig.tar.gz && \
    tar xfz swig.tar.gz && rm swig.tar.gz && \
    cd swig-$RC_SWIG_VERSION && \
    ./configure --with-python=$PYTHON && \
    make && \
    sudo make install && \
    cd ../ && sudo rm -rf swig-$RC_SWIG_VERSION
 
 # GIT Install
 ENV \
     RC_GIT_VER=2.41.0 \
     # make git scripts visible
     PATH=/home/$RC_USER/git/bin:$PATH
 
 RUN \
    echo "** install git packages $RC_GIT_VER **" && \
    curl -L https://www.kernel.org/pub/software/scm/git/git-$RC_GIT_VER.tar.gz -o git.tar.gz && \
    tar xfz git.tar.gz && rm git.tar.gz && \
    cd git-$RC_GIT_VER && \
    ./configure --prefix=/home/$RC_USER/git && \
    make NO_GETTEXT=yes NO_MSGFMT=yes && \
    sudo make install && \
    cd ../ && sudo rm -rf git-$RC_GIT_VER
 
 RUN \
    echo "** install git symlinks **" && \
    mkdir -p $BUILD_BIN_DIR/vcs_bin && \
    sudo chown $RC_USER:$RC_USER /home/$RC_USER/git && \
    ln -s /home/$RC_USER/git/bin/git $BUILD_BIN_DIR/vcs_bin/git
 
 # Apache2 install
 ENV \
-    RC_APACHE2_VER=2.4.57 \
+    RC_APACHE2_VER=2.4.58 \
     # make apache scripts visible
     PATH=/home/$RC_USER/apache2/bin:$PATH
 
 RUN \
    echo "** install Apache packages $RC_SVN_VER **" && \
    curl -L https://archive.apache.org/dist/httpd/httpd-$RC_APACHE2_VER.tar.gz -o apache2.tar.gz && \
    tar xfz apache2.tar.gz && rm apache2.tar.gz && \
    cd httpd-$RC_APACHE2_VER && \
    ./configure --prefix=/home/$RC_USER/apache2 --enable-mods-shared=reallyall --enable-dav --enable-authn-anon && \
    make && \
    make install && \
    cd ../ && sudo rm -rf httpd-$RC_APACHE2_VER
 
 # custom SVN virtualhost
 COPY \
     service/svn/virtualhost.conf /home/$RC_USER/apache2/conf/virtualhost.conf
 
 RUN \
 echo "**** Apache config ****" && \
     sed -i "s/Listen 80/Listen ${MOD_DAV_SVN_PORT}/g" /home/$RC_USER/apache2/conf/httpd.conf && \
     sed -i "s/#LoadModule dav_module modules\/mod_dav.so/LoadModule dav_module modules\/mod_dav.so/g" /home/$RC_USER/apache2/conf/httpd.conf && \
     sed -i "s/User daemon/User ${RC_USER}/g" /home/$RC_USER/apache2/conf/httpd.conf && \
     sed -i "s/Group daemon/Group ${RC_USER}/g" /home/$RC_USER/apache2/conf/httpd.conf && \
-    sed -i "s/#ServerName www.example.com:80/ServerName ${HOSTNAME}/g" /home/$RC_USER/apache2/conf/httpd.conf
+    sed -i "s/ServerAdmin [e-mail]/ServerAdmin admin@${HOSTNAME}/g" /home/$RC_USER/apache2/conf/httpd.conf && \
+    sed -i "s/ServerName buildkitsandbox/ServerName ${HOSTNAME}/g" /home/$RC_USER/apache2/conf/httpd.conf && \
+    sed -i "s/#Include conf\/extra\/httpd-vhosts.conf/Include conf\/virtualhost.conf/g" /home/$RC_USER/apache2/conf/httpd.conf
+
 
 # Subversion install
 # https://svn.apache.org/repos/asf/subversion/trunk/subversion/bindings/swig/INSTALL
 
 ENV \
     RC_SVN_VER=1.14.2 \
     SVN_PREFIX=/home/$RC_USER/subversion \
     # make svn scripts visible
     PATH=/home/$RC_USER/subversion/bin:$PATH
 
 
 RUN \
    echo "** install svn packages $RC_SVN_VER **" && \
    curl -L https://downloads.apache.org/subversion/subversion-$RC_SVN_VER.tar.gz -o subversion.tar.gz && \
    tar xfz subversion.tar.gz && rm subversion.tar.gz && \
    cd subversion-$RC_SVN_VER && \
    ./autogen.sh && \
    ./configure --prefix=$SVN_PREFIX --with-apxs=/home/$RC_USER/apache2/bin/apxs --enable-mod-activation --with-swig=/usr/local/bin/swig && \
    make && \
    sudo make install && \
    sudo make clean-swig-py && \
    sudo make swig-py         swig_pydir=$VENV_PATH/lib/$PYTHON_VERSION/site-packages/libsvn swig_pydir_extra=$VENV_PATH/lib/$PYTHON_VERSION/site-packages/svn && \
    sudo make install-swig-py swig_pydir=$VENV_PATH/lib/$PYTHON_VERSION/site-packages/libsvn swig_pydir_extra=$VENV_PATH/lib/$PYTHON_VERSION/site-packages/svn && \
    sudo ldconfig -v && \
    cd ../ && sudo rm -rf subversion-$RC_SVN_VER
 
 RUN \
    echo "** install svn symlinks **" && \
    mkdir -p $BUILD_BIN_DIR/vcs_bin && \
    sudo chown $RC_USER:$RC_USER /home/$RC_USER/subversion && \
    echo $(strings $MOD_DAV_SVN_MODULE | grep 'Powered by') > $BUILD_BIN_DIR/vcs_bin/mod_dav_svn.version && \
    ln -s /home/$RC_USER/subversion/svn $BUILD_BIN_DIR/vcs_bin/svn && \
    ln -s /home/$RC_USER/subversion/svnadmin $BUILD_BIN_DIR/vcs_bin/svnadmin && \
    ln -s /home/$RC_USER/subversion/svnbench $BUILD_BIN_DIR/vcs_bin/svnbench && \
    ln -s /home/$RC_USER/subversion/svndumpfilter $BUILD_BIN_DIR/vcs_bin/svndumpfilter && \
    ln -s /home/$RC_USER/subversion/svnfsfs $BUILD_BIN_DIR/vcs_bin/svnfsfs && \
    ln -s /home/$RC_USER/subversion/svnlook $BUILD_BIN_DIR/vcs_bin/svnlook && \
    ln -s /home/$RC_USER/subversion/svnmucc $BUILD_BIN_DIR/vcs_bin/svnmucc && \
    ln -s /home/$RC_USER/subversion/svnversion $BUILD_BIN_DIR/vcs_bin/svnversion && \
    ln -s /home/$RC_USER/subversion/svnsync $BUILD_BIN_DIR/vcs_bin/svnsync && \
    ln -s /home/$RC_USER/subversion/svnserve $BUILD_BIN_DIR/vcs_bin/svnserve && \
    ln -s /home/$RC_USER/subversion/svnrdump $BUILD_BIN_DIR/vcs_bin/svnrdump
 
 #TODO: compile libgit2
 #https://www.pygit2.org/install.html#advanced
 #ENV \
 #    RC_LIBGIT2_VER=1.14.2 \
 # curl -L https://github.com/libgit2/libgit2/archive/refs/tags/v$RC_LIBGIT2_VER.tar.gz -o libgit2.tar.gz
 # tar xzf libgit2.tar.gz && rm libgit2.tar.gz
 # cd libgit2-$RC_LIBGIT2_VER/
 # cmake .
 # make
 # sudo make install \
 #
 
 # Copy artifacts
 #COPY --chown=$RC_USER:$RC_USER .cache/locale-archive /var/opt/
 COPY --chown=$RC_USER:$RC_USER config/_shared/rhodecode_enterprise.license /home/$RC_USER/.rccontrol/bootstrap/
 COPY --chown=$RC_USER:$RC_USER service/rhodecode/bootstrap/* /home/$RC_USER/.rccontrol/bootstrap/
 COPY --chown=$RC_USER:$RC_USER .source/ /home/$RC_USER/
 
 # VCS
 RUN \
 echo "** install vcsserver ${RHODECODE_VERSION} **" && \
    $PIP_EXECUTABLE install --disable-pip-version-check --trusted-host pypi.python.org --no-cache-dir \
      -r /home/$RC_USER/rhodecode-vcsserver/requirements.txt && \
    $PIP_EXECUTABLE install /home/$RC_USER/rhodecode-vcsserver
 
 RUN \
 #echo "** copy config of vcsserver ${RHODECODE_VERSION} **" && \
   VCSSERVER_PATH=/home/$RC_USER/rhodecode-vcsserver && \
   rm -rf $BUILD_BIN_DIR/vcs_bin && \
   cp -rv --preserve=links $VENV_PATH/bin $BUILD_BIN_DIR/vcs_bin && \
   cp -v ${VCSSERVER_PATH}/configs/production.ini $BUILD_CONF/vcsserver.ini && \
   cp -v ${VCSSERVER_PATH}/configs/gunicorn_config.py $BUILD_CONF/gunicorn_conf_vcs.py && \
   echo "Done copy config of vcsserver"
 
 # CE
 RUN \
 echo "** install rhodecode-ce ${RHODECODE_VERSION} **" && \
   $PIP_EXECUTABLE install --disable-pip-version-check --trusted-host pypi.python.org --no-cache-dir \
     -r /home/$RC_USER/rhodecode-enterprise-ce/requirements_rc_tools.txt \
     -r /home/$RC_USER/rhodecode-enterprise-ce/requirements.txt && \
   $PIP_EXECUTABLE install /home/$RC_USER/rhodecode-enterprise-ce
 
 RUN \
 echo "** copy config of rhodecode-ce ${RHODECODE_VERSION} **" && \
   RHODECODE_PATH=/home/$RC_USER/rhodecode-enterprise-ce && \
   rm -rf $BUILD_BIN_DIR/bin && \
   cp -rv --preserve=links $VENV_PATH/bin $BUILD_BIN_DIR/bin && \
   cp -v ${RHODECODE_PATH}/configs/production.ini $BUILD_CONF/rhodecode.ini && \
   cp -v ${RHODECODE_PATH}/configs/gunicorn_config.py $BUILD_CONF/gunicorn_conf_rc.py && \
   mkdir -p $RHODECODE_STATIC_DIR/static/ && cp -Rf /${RHODECODE_PATH}/rhodecode/public/* $RHODECODE_STATIC_DIR/static/ && chmod 755 -R $RHODECODE_STATIC_DIR/static/ && \
   echo "Done copy config of rhodecode-ce"
 
 # EE
 RUN \
 echo "** install rhodecode-ee ${RHODECODE_VERSION} **" && \
   $PIP_EXECUTABLE install --disable-pip-version-check --trusted-host pypi.python.org --no-cache-dir \
     -r /home/$RC_USER/rhodecode-enterprise-ee/requirements.txt && \
   $PIP_EXECUTABLE install /home/$RC_USER/rhodecode-enterprise-ee
 
 RUN \
 echo "** copy config of rhodecode-ee ${RHODECODE_VERSION} **" && \
   RHODECODE_PATH=/home/$RC_USER/rhodecode-enterprise-ee && \
   rm -rf $BUILD_BIN_DIR/bin && \
   cp -rv --preserve=links $VENV_PATH/bin $BUILD_BIN_DIR/bin && \
   cp -v ${RHODECODE_PATH}/configs/production.ini $BUILD_CONF/rhodecode.ini && \
   cp -v ${RHODECODE_PATH}/configs/gunicorn_config.py $BUILD_CONF/gunicorn_conf_rc.py && \
   mkdir -p $RHODECODE_STATIC_DIR/static/ && cp -Rf /${RHODECODE_PATH}/rc_ee/public/* $RHODECODE_STATIC_DIR/static/ && chmod 755 -R $RHODECODE_STATIC_DIR/static/ && \
   find $RHODECODE_STATIC_DIR/static/ -type f -name "*.less" -delete && \
   find $RHODECODE_STATIC_DIR/static/js/src -type f -name "*.js" -delete && \
   rm   $RHODECODE_STATIC_DIR/static/js/scripts.js && \
   echo "Done copy config of rhodecode-ee"
 
 
 RUN \
    echo "** cleanup of EE code **" && \
    for out in "rc_ee" "rc_auth_plugins" "rc_chat" "rc_elasticsearch" "rc_integrations" "rc_license" "rc_reviewers"; do \
 		echo ; \
 	    echo "cleanup of '$VENV_PATH/lib/$PYTHON_VERSION/site-packages/$out'"; \
   		rm -rf $VENV_PATH/lib/$PYTHON_VERSION/site-packages/$out/tests; \
   		rm -rf `find $VENV_PATH/lib/$PYTHON_VERSION/site-packages/$out -path "*__pycache__"`; \
   		rm -f  `find $VENV_PATH/lib/$PYTHON_VERSION/site-packages/$out -type f \( -name "*.py" -o -name "*.c" \) -not -name "__init__.py" -not -path "*celerylib/tasks.py"`; \
   		rm -f `echo "\`find $VENV_PATH/lib/$PYTHON_VERSION/site-packages/$out -type f -name \"*.so\"\` " | sed -e "s/\.so[ \t]*/\.pyc /g"`; \
    done
 
 
 USER root
 
 RUN \
 echo "**** cleanup ****" && \
     apt-get remove -y $CLEANUP_DEPS && \
     apt-get autoclean -y && \
     rm -rf /tmp/* && \
     rm -rf /home/$RC_USER/.cache/pip && \
     rm -f /home/$RC_USER/.rccontrol/cache/RhodeCode-* && \
     rm -rf /var/lib/apt/lists/* && \
     rm -rf /var/cache/apk/* && \
     rm -f ${SUPERVISOR_CONF} && \
     echo "Done cleanup"
 
 RUN \
 echo "**** cleanup source ****" && \
     rm -rf /home/$RC_USER/*.sh && \
     rm -rf /home/$RC_USER/rhodecode-vcsserver && \
     rm -rf /home/$RC_USER/rhodecode-enterprise-ce && \
     rm -rf /home/$RC_USER/rhodecode-enterprise-ee && \
     echo "Done cleanup source"
 
 # copy entrypoints
 COPY entrypoints.d/entrypoint.sh /opt/entrypoints.d/entrypoint.sh
 
 RUN chmod +x /opt/entrypoints.d/entrypoint.sh
 
 # config volume
 VOLUME /etc/rhodecode/conf
 
 # repo store volume
 VOLUME /var/opt/rhodecode_repo_store
 
 # data volume
 VOLUME /var/opt/rhodecode_data
 
 ENTRYPOINT ["/opt/entrypoints.d/entrypoint.sh"]
 
 # compose can override this
 CMD [ "$BUILD_BIN_DIR/bin/gunicorn", "--error-logfile=-", "--paster=/etc/rhodecode/conf_build/rhodecode.ini", "--config=/etc/rhodecode/conf_build/gunicorn_conf_rc.py" ]

service/rhodecode/rhodecode_source.dockerfile

@@ -1,338 +1,339 b''
 # source-install
 
 FROM ubuntu:22.04
 # Using 22.04 LTS Release
 
 ARG TZ="UTC"
 ARG LOCALE_TYPE=en_US.UTF-8
 ARG RHODECODE_TYPE=Enterprise
 
 ARG RHODECODE_VERSION=4.28.0
 
 ARG RHODECODE_DB=sqlite
 ARG RHODECODE_USER_NAME=admin
 ARG RHODECODE_USER_PASS=secret4
 ARG RHODECODE_USER_EMAIL=[e-mail]
 
 # nix ver/channels
 ARG DEV_NIX_VERSION=2.0.4
 ARG DEV_NIX_CHANNEL=nixos-18.03
 
 # env are runtime
 ENV \
     TZ=${TZ} \
     LOCALE_TYPE=${LOCALE_TYPE} \
     \
     ## Define type we build, and the instance we'll create
     RHODECODE_TYPE=${RHODECODE_TYPE} \
     RC_TYPE_ID=enterprise-1 \
     \
     ## SETUP ARGS FOR INSTALLATION ##
     ## set version we build on, get from .env or set default ver
     RHODECODE_VERSION=${RHODECODE_VERSION} \
     \
     ## set DB, default sqlite
     RHODECODE_DB=${RHODECODE_DB} \
     \
     ## set app bootstrap required data
     RHODECODE_USER_NAME=${RHODECODE_USER_NAME} \
     RHODECODE_USER_PASS=${RHODECODE_USER_PASS} \
     RHODECODE_USER_EMAIL=${RHODECODE_USER_EMAIL} \
     \
     RC_USER=rhodecode \
     \
     # SVN CONFIG
     MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \
     MOD_DAV_SVN_PORT=8090 \
+    MOD_DAV_SVN_LOG_LEVEL=info \
     MOD_DAV_CORE_MODULES_DIR=/usr/lib/apache2/modules \
     MOD_DAV_SVN_MODULE=/usr/lib/apache2/modules/mod_dav_svn.so \
     \
     # SSHD CONFIG
     SSHD_CONF_FILE=/etc/rhodecode/sshd_config \
     \
     SHARED_CONF_DIR=/etc/rhodecode/conf \
     BUILD_CONF=/etc/rhodecode/conf_build \
     BUILD_BIN_DIR=/usr/local/bin/rhodecode_bin \
     RHODECODE_DATA_DIR=/var/opt/rhodecode_data \
     RHODECODE_REPO_DIR=/var/opt/rhodecode_repo_store \
     RHODECODE_HTTP_PORT=10020 \
     RHODECODE_VCS_PORT=10010 \
     RHODECODE_HOST=0.0.0.0 \
     RHODECODE_VCS_HOST=127.0.0.1
 
 ENV \
     # make application scripts visible
     PATH=$PATH:/home/$RC_USER/.rccontrol-profile/bin \
     RCCONTROL=/home/$RC_USER/.rccontrol-profile/bin/rccontrol \
     SUPERVISOR_CONF=/home/$RC_USER/.rccontrol/supervisor/supervisord.ini
 
 
 ENV SVN_LOCALE_DEPS apache2 apache2-utils libapache2-mod-svn
 ENV SSH_LOCALE_DEPS openssh-server
 ENV PYTHON_DEPS python2
 ENV EXTRA_DEPS ""
 
 ENV \
     NIX_BLD_USER=nixbld \
     NIX_PATH=/nix/var/nix/profiles/per-user/$RC_USER/channels \
     NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt \
     PATH=$PATH:/nix/var/nix/profiles/per-user/$RC_USER/profile/bin:/home/$RC_USER/rhodecode-enterprise-ee/profile/bin
 
 RUN \
 echo "** install base packages **" && \
 set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update; \
 	DEBIAN_FRONTEND="noninteractive" \
 	apt-get install -y --no-install-recommends \
         tini \
         bash \
         binutils \
         tzdata \
         locales \
         openssl \
         curl \
         sudo \
         gosu \
         bzip2 unzip \
         ca-certificates \
         $PYTHON_DEPS \
         $SSH_LOCALE_DEPS \
         $SVN_LOCALE_DEPS \
         $EXTRA_DEPS \
 	; \
 	rm -rf /var/lib/apt/lists/*;
 
 RUN \
 echo "** Configure the python executable for py2/3 compat **" && \
 IS_PY=$(which python3 || which python2) && \
 if [ -n $IS_PY ] ; then ln -s $IS_PY /usr/bin/python ; fi
 
 RUN \
 echo "** Configure the locales **" && \
     sed -i "s/^# ${LOCALE_TYPE}/${LOCALE_TYPE}/g" /etc/locale.gen && \
     locale-gen
 
 RUN \
    echo "Fix python link" && \
    ln -fs /usr/lib/python2.7/plat-x86_64-linux-gnu/_sysconfigdata_nd.py /usr/lib/python2.7/
 
 
 # locale-archive is a fix for old nix glibc2.26 locales available
 ENV \
     LOCALE_ARCHIVE=/var/opt/locale-archive \
     LANG=${LOCALE_TYPE} \
     LANGUAGE=${LOCALE_TYPE} \
     LC_ALL=${LOCALE_TYPE}
 
 # configure the system user
 # explicitly set uid/gid to guarantee that it won't change in the future
 # the values 999:999 are identical to the current user/group id assigned
 RUN \
 echo "** Create system user $RC_USER **" && \
   groupadd --system --gid 999 $RC_USER && \
   useradd --system --gid $RC_USER --uid 999 --shell /bin/bash $RC_USER && \
   usermod -G $RC_USER $RC_USER
 
 RUN \
 echo "** Create nix-build user $NIX_BLD_USER **" && \
     groupadd --system --gid 1099 $NIX_BLD_USER && \
     useradd --system --gid $NIX_BLD_USER --uid 1099 --shell /bin/bash $NIX_BLD_USER && \
     usermod -G $NIX_BLD_USER $NIX_BLD_USER
 
 RUN \
 echo "** disable nix sandboxing **" && \
     mkdir /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf
 
 
 # set the defult bash shell
 SHELL ["/bin/bash", "-c"]
 
 # Fix and set a timezone
 RUN \
   echo "** configure the timezone **" && \
   rm /etc/localtime && cp /usr/share/zoneinfo/$TZ /etc/localtime && \
   echo $TZ > /etc/timezone
 
 
 RUN \
   echo "** prepare rhodecode store and cache **" && \
   install -d -m 0700 -o $RC_USER -g $RC_USER /nix && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /opt/rhodecode && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /usr/local/bin/rhodecode_bin && \
   install -d -m 0755 -o $RC_USER -g $RC_USER $RHODECODE_REPO_DIR && \
   install -d -m 0755 -o $RC_USER -g $RC_USER $RHODECODE_DATA_DIR && \
   install -d -m 0755 -o $RC_USER -g $RC_USER $BUILD_CONF && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/rhodecode-vcsserver && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/rhodecode-enterprise-ce && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/rhodecode-enterprise-ee && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/ && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol/cache && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol/bootstrap && \
   install -d -m 0700 -o $RC_USER -g $RC_USER /home/$RC_USER/.ssh && \
   install -d -m 0700 -o $RC_USER -g $RC_USER /home/$RC_USER/.rhoderc
 
 # expose our custom sshd config
 COPY service/sshd/sshd_config $SSHD_CONF_FILE
 
 # Apache SVN setup
 RUN \
     echo "**** Apache config cleanup ****" && \
     rm -f /etc/apache2/conf.d/info.conf \
           /etc/apache2/conf.d/mpm.conf \
           /etc/apache2/conf.d/userdir.conf && \
     rm -f /etc/apache2/sites-enabled/* && \
     rm -f /etc/apache2/sites-available/*
 
 # custom SVN virtualhost
 COPY service/svn/virtualhost.conf /etc/apache2/sites-enabled/
 
 RUN \
 echo "**** Apache config ****" && \
     echo $(strings /usr/lib/apache2/modules/mod_dav_svn.so | grep 'Powered by') > /var/opt/dav.version && \
     mkdir -p /run/apache2 && \
     mkdir -p /var/opt/www && \
     echo "unset HOME" > /etc/apache2/envvars && \
     echo "export APACHE_RUN_USER=${RC_USER}" >> /etc/apache2/envvars && \
     echo "export APACHE_PID_FILE=/var/run/apache2/apache2.pid" >> /etc/apache2/envvars && \
     echo "export APACHE_RUN_DIR=/var/run/apache2" >> /etc/apache2/envvars && \
     echo "export APACHE_LOCK_DIR=/var/lock/apache2" >> /etc/apache2/envvars && \
     echo "export APACHE_RUN_USER=${RC_USER}" >> /etc/apache2/envvars && \
     echo "export APACHE_RUN_GROUP=${RC_USER}" >> /etc/apache2/envvars && \
     sed -i "s/Listen 80/Listen ${MOD_DAV_SVN_PORT}/g" /etc/apache2/ports.conf
 
 
 # Copy artifacts
 
 COPY --chown=$RC_USER:$RC_USER .cache/locale-archive /var/opt/
 COPY --chown=$RC_USER:$RC_USER .cache/RhodeCode* /home/$RC_USER/.rccontrol/cache/
 COPY --chown=$RC_USER:$RC_USER config/_shared/rhodecode_enterprise.license /home/$RC_USER/.rccontrol/bootstrap/
 COPY --chown=$RC_USER:$RC_USER service/rhodecode/bootstrap/* /home/$RC_USER/.rccontrol/bootstrap/
 COPY --chown=$RC_USER:$RC_USER .source/ /home/$RC_USER/
 
 
 RUN \
 echo "** prepare rhodecode dirs **" && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol/vcsserver-1 && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol/community-1 && \
   install -d -m 0755 -o $RC_USER -g $RC_USER /home/$RC_USER/.rccontrol/enterprise-1 && \
   echo "Done rhodecode dirs"
 
 # change to non-root user for RUN commands
 USER $RC_USER
 WORKDIR /home/$RC_USER
 
 RUN \
     echo "** save nix config **" && \
     touch /home/$RC_USER/.rhoderc && \
     mkdir -p /home/$RC_USER/.nixpkgs && touch /home/$RC_USER/.nixpkgs/config.nix && \
     printf '{\n  rc = {\n   sources = {\n    rhodecode-vcsserver = "/home/'$RC_USER'/rhodecode-vcsserver";\n    rhodecode-enterprise-ce = "/home/'$RC_USER'/rhodecode-enterprise-ce";\n    rhodecode-enterprise-ee = "/home/'$RC_USER'/rhodecode-enterprise-ee";\n   };\n  };\n}\n' > /home/$RC_USER/.nixpkgs/config.nix
 
 RUN \
 echo "** download and install nix ** from $DEV_NIX_VERSION/install" && \
     curl -L https://releases.nixos.org/nix/nix-$DEV_NIX_VERSION/install | USER=$RC_USER /bin/bash && \
     echo "Done nix install"
 
 RUN \
 echo "** update nix package database and set channel to $DEV_NIX_CHANNEL **" && \
     . /home/rhodecode/.nix-profile/etc/profile.d/nix.sh && \
 	nix-channel --add https://channels.nixos.org/$DEV_NIX_CHANNEL nixpkgs && \
 	nix-channel --update && \
     echo "done nix package updates"
 
 RUN \
 echo "** install rhodecode control **" && \
 #  cd /home/$RC_USER/.rccontrol/cache && \
 #  INSTALLER=$(ls -Art /home/$RC_USER/.rccontrol/cache/RhodeCode-installer-* | tail -n 1) && \
 #  chmod +x ${INSTALLER} && \
 #  ${INSTALLER} --accept-license && \
 #  ${RCCONTROL} self-init && \
 #  cp -v /home/$RC_USER/.rccontrol-profile/etc/ca-bundle.crt $BUILD_CONF/ && \
   echo "Done installing rhodecode control"
 
 RUN \
 echo "** install vcsserver ${RHODECODE_VERSION} **" && \
   . /home/rhodecode/.nix-profile/etc/profile.d/nix.sh && \
   nix-build --show-trace --cores 0 --max-jobs 4 --no-build-output --out-link /home/$RC_USER/.rccontrol/vcsserver-1/profile rhodecode-vcsserver/default.nix && \
   nix-shell --command 'echo COMMAND FROM NIX-SHELL TEST' rhodecode-vcsserver/default.nix && \
   echo "Done installing vcsserver"
 
 RUN \
 echo "** copy config of vcsserver ${RHODECODE_VERSION} **" && \
   VCSSERVER_PATH=/home/$RC_USER/rhodecode-vcsserver && \
   rm -rf $BUILD_BIN_DIR/vcs_bin && \
   cp -rv --preserve=links /home/$RC_USER/.rccontrol/vcsserver-1/profile/bin $BUILD_BIN_DIR/vcs_bin && \
   cp -v ${VCSSERVER_PATH}/configs/production.ini $BUILD_CONF/vcsserver.ini && \
   cp -v ${VCSSERVER_PATH}/configs/gunicorn_config.py $BUILD_CONF/gunicorn_conf_vcs.py && \
   echo "Done copy config of vcsserver"
 
 RUN \
 echo "** install build Community ${RHODECODE_VERSION} **" && \
   . /home/rhodecode/.nix-profile/etc/profile.d/nix.sh && \
   echo "done"
 
 RUN \
 echo "** install rhodecode ${RHODECODE_VERSION} **" && \
   . /home/rhodecode/.nix-profile/etc/profile.d/nix.sh && \
   nix-build --show-trace --cores 0 --max-jobs 4 --no-build-output --out-link /home/$RC_USER/.rccontrol/enterprise-1/profile rhodecode-enterprise-ee/default.nix && \
   nix-shell --command 'echo ok' rhodecode-enterprise-ee/default.nix && \
   echo "Done installing rhodecode"
 
 
 RUN \
 echo "** copy config of rhodecode ${RHODECODE_VERSION} **" && \
   RHODECODE_PATH=/home/$RC_USER/rhodecode-enterprise-ee && \
   rm -rf $BUILD_BIN_DIR/bin && \
   cp -rv --preserve=links /home/$RC_USER/.rccontrol/enterprise-1/profile/bin $BUILD_BIN_DIR/ && \
   cp -v ${RHODECODE_PATH}/configs/production.ini $BUILD_CONF/rhodecode.ini && \
   cp -v ${RHODECODE_PATH}/configs/gunicorn_config.py $BUILD_CONF/gunicorn_conf_rc.py && \
   mkdir -p $RHODECODE_DATA_DIR/static && cp -r /home/$RC_USER/.rccontrol/enterprise-1/profile/etc/static/* $RHODECODE_DATA_DIR/static/ && \
   echo "Done copy config of rhodecode"
 
 
 #RUN \
 #echo "** configure supervisord **" && \
 #  cp -v ${SUPERVISOR_CONF} $BUILD_CONF/ && \
 #  sed -i "s/self_managed_supervisor = False/self_managed_supervisor = True/g" /home/$RC_USER/.rccontrol.ini && \
 #  echo "Done installing supervisord"
 
 USER root
 
 RUN \
 echo "**** cleanup ****" && \
     apt-get remove -y $PYTHON_DEPS && \
     apt-get autoclean -y && \
     rm -f /tmp/* && \
     rm -f /home/$RC_USER/.rccontrol/cache/RhodeCode-* && \
     rm -rf /var/lib/apt/lists/* && \
     rm -rf /var/cache/apk/* && \
     rm -f ${SUPERVISOR_CONF} && \
     echo "Done cleanup"
 
 RUN \
 echo "**** cleanup source ****" && \
     rm -rf /home/$RC_USER/rhodecode-vcsserver && \
     rm -rf /home/$RC_USER/rhodecode-enterprise-ce && \
     rm -rf /home/$RC_USER/rhodecode-enterprise-ee && \
     echo "Done cleanup source"
 
 # copy entrypoints
 COPY entrypoints.d/entrypoint.sh /opt/entrypoints.d/entrypoint.sh
 
 RUN chmod +x /opt/entrypoints.d/entrypoint.sh
 
 # config volume
 VOLUME /etc/rhodecode/conf
 
 # repo store volume
 VOLUME /var/opt/rhodecode_repo_store
 
 # data volume
 VOLUME /var/opt/rhodecode_data
 
 ENTRYPOINT ["/opt/entrypoints.d/entrypoint.sh"]
 
 # compose can override this
 CMD [ "$BUILD_BIN_DIR/bin/gunicorn", "--error-logfile=-", "--paster=/etc/rhodecode/conf_build/rhodecode.ini", "--config=/etc/rhodecode/conf_build/gunicorn_conf_rc.py" ]

service/svn/rhodecode_svn.dockerfile

@@ -1,97 +1,98 b''
 FROM ubuntu:22.04
 # Using 22.04 LTS Release
 MAINTAINER RhodeCode Inc. <[e-mail]>
 
 
 ENV \
     RC_USER=rhodecode \
     # SVN CONFIG
     MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \
-    MOD_DAV_SVN_PORT=8090
+    MOD_DAV_SVN_PORT=8090 \
+    MOD_DAV_SVN_LOG_LEVEL=info
 
 ENV SVN_LOCALE_DEPS apache2 apache2-utils libapache2-mod-svn subversion
 #apache2-webdav
 
 RUN \
 echo "** install svn base packages **" && \
 set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update; \
 	DEBIAN_FRONTEND="noninteractive" \
 	apt-get install -y --no-install-recommends \
         tini \
         bash \
         binutils \
         tzdata \
         locales \
         openssl \
         curl \
         sudo \
         gosu \
         bzip2 \
         ca-certificates \
         $SVN_LOCALE_DEPS \
 	; \
 	rm -rf /var/lib/apt/lists/*;
 
 
 # configure the system user
 # explicitly set uid/gid to guarantee that it won't change in the future
 # the values 999:999 are identical to the current user/group id assigned
 RUN \
 echo "** Create system user $RC_USER **" && \
   groupadd --system --gid 999 $RC_USER && \
   useradd --system --gid $RC_USER --uid 999 --shell /bin/bash $RC_USER && \
   usermod -G $RC_USER $RC_USER
 
 # Apache SVN setup
 RUN \
     echo "**** Apache config cleanup ****" && \
     rm -f /etc/apache2/conf.d/info.conf \
           /etc/apache2/conf.d/mpm.conf \
           /etc/apache2/conf.d/userdir.conf && \
     rm -f /etc/apache2/sites-enabled/* && \
     rm -f /etc/apache2/sites-available/*
 
 # custom SVN virtualhost
 COPY service/svn/virtualhost.conf /etc/apache2/sites-enabled/
 
 RUN \
 echo "**** Apache config ****" && \
     echo $(strings /usr/lib/apache2/modules/mod_dav_svn.so | grep 'Powered by') > /var/opt/dav.version && \
     mkdir -p /run/apache2 && \
     mkdir -p /var/opt/www && \
     echo "unset HOME" > /etc/apache2/envvars && \
     echo "export APACHE_RUN_USER=${RC_USER}" >> /etc/apache2/envvars && \
     echo "export APACHE_PID_FILE=/var/run/apache2/apache2.pid" >> /etc/apache2/envvars && \
     echo "export APACHE_RUN_DIR=/var/run/apache2" >> /etc/apache2/envvars && \
     echo "export APACHE_LOCK_DIR=/var/lock/apache2" >> /etc/apache2/envvars && \
     echo "export APACHE_RUN_USER=${RC_USER}" >> /etc/apache2/envvars && \
     echo "export APACHE_RUN_GROUP=${RC_USER}" >> /etc/apache2/envvars && \
     sed -i "s/Listen 80/Listen ${MOD_DAV_SVN_PORT}/g" /etc/apache2/ports.conf
 
 USER root
 
 RUN \
 echo "**** cleanup ****" && \
     apt-get autoclean -y && \
     rm -f /tmp/* && \
     rm -rf /var/lib/apt/lists/* \
     rm -rf /var/cache/apk/*
 
 
 # copy entrypoints
 COPY entrypoints.d/svn-entrypoint.sh /opt/entrypoints.d/svn-entrypoint.sh
 RUN chmod +x /opt/entrypoints.d/svn-entrypoint.sh
 
 # config volume
 VOLUME /etc/rhodecode/conf
 
 # repo store volume
 VOLUME /var/opt/rhodecode_repo_store
 
 
 ENTRYPOINT ["/opt/entrypoints.d/svn-entrypoint.sh"]
 
 CMD ["apachectl", "-D", "FOREGROUND"]
  No newline at end of file

service/svn/virtualhost.conf

@@ -1,34 +1,30 b''
 LoadModule headers_module    ${MOD_DAV_CORE_MODULES_DIR}/mod_headers.so
 LoadModule authn_anon_module ${MOD_DAV_CORE_MODULES_DIR}/mod_authn_anon.so
 LoadModule dav_module        ${MOD_DAV_CORE_MODULES_DIR}/mod_dav.so
 LoadModule dav_svn_module    ${MOD_DAV_SVN_MODULE}
 
 ErrorLogFormat "{ \"time\":\"%{%Y-%m-%d}tT%{%T}t.%{msec_frac}tZ\", \"function\" : \"[%-m:%l]\" , \"process\" : \"[pid %P:tid %T]\" , \"message\" : \"%M\" ,\ \"referer\"\ : \"%{Referer}i\" }"
 LogFormat "{ \"time\":\"%{%Y-%m-%d}tT%{%T}t.%{msec_frac}tZ\", \"process\":\"%D\", \"filename\":\"%f\", \"remoteIP\":\"%a\", \"host\":\"%V\", \"request\":\"%U\", \"query\":\"%q\", \"method\":\"%m\", \"status\":\"%>s\", \"userAgent\":\"%{User-agent}i\", \"referer\":\"%{Referer}i\" }" combined
 
-ErrorLog /dev/stderr
-TransferLog /dev/stdout
-CustomLog /dev/stdout combined
+ErrorLog /proc/self/fd/2
+CustomLog /proc/self/fd/1 combined
+LogLevel ${MOD_DAV_SVN_LOG_LEVEL}
 
 <VirtualHost *:${MOD_DAV_SVN_PORT}>
     ServerAdmin admin@localhost
     DocumentRoot /var/opt/www
 
     ErrorLogFormat "{ \"time\":\"%{%Y-%m-%d}tT%{%T}t.%{msec_frac}tZ\", \"function\" : \"[%-m:%l]\" , \"process\" : \"[pid %P:tid %T]\" , \"message\" : \"%M\" ,\ \"referer\"\ : \"%{Referer}i\" }"
     LogFormat "{ \"time\":\"%{%Y-%m-%d}tT%{%T}t.%{msec_frac}tZ\", \"process\":\"%D\", \"filename\":\"%f\", \"remoteIP\":\"%a\", \"host\":\"%V\", \"request\":\"%U\", \"query\":\"%q\", \"method\":\"%m\", \"status\":\"%>s\", \"userAgent\":\"%{User-agent}i\", \"referer\":\"%{Referer}i\" }" combined
 
-    ErrorLog /dev/stderr
-    CustomLog /dev/stdout combined
-    LogLevel info
-
     <Location /_server_status>
         Require ip 127
         SetHandler server-status
         Require all granted
     </Location>
 
     # allows custom host names, prevents 400 errors on checkout
     HttpProtocolOptions Unsafe
 
     Include ${MOD_DAV_SVN_CONF_FILE}
 </VirtualHost>
  No newline at end of file