fix(core): moved the custom build files and definition to subfolders

service/rhodecode/rhodecode_4_venv.dockerfile

@@ -0,0 +1,412 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=4.28.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_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_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 \
+    python2
+ENV PYTHON_DEV_DEPS \
+    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 python2-dev
+
+ENV EXTRA_DEPS \
+    vim pkg-config openssl libbz2-1.0 libbz2-dev sqlite3 cpanminus libapr1 npm nodejs
+
+# 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; \
+	\
+	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 $PYTHON_DEV_DEPS\
+        $SSH_DEPS \
+        $SVN_DEPS $SVN_DEV_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
+
+#  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_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
+
+# 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/
+
+# change to non-root user for RUN commands
+USER $RC_USER
+WORKDIR /home/$RC_USER
+
+ENV \
+    VENV_PATH=/home/$RC_USER/venv
+
+ENV \
+    PIP_EXECUTABLE=$VENV_PATH/bin/pip2.7 \
+    # 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/pip/2.7/get-pip.py -o get-pip.py && \
+   /usr/bin/python2.7 get-pip.py \
+      --disable-pip-version-check \
+      --no-cache-dir \
+      --no-compile && \
+   rm get-pip.py
+
+RUN /home/$RC_USER/.local/bin/pip install --user virtualenv
+RUN /home/$RC_USER/.local/bin/virtualenv --pip "19.3.1" --setuptools "41.6.0" --python="/usr/bin/python2.7" $VENV_PATH
+## Install any needed packages specified in requirements.txt
+RUN $PIP_EXECUTABLE install --upgrade "setuptools_scm<6.0.0"
+
+#swig install
+
+ENV \
+    PYTHON=$VENV_PATH/bin/python2 \
+    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.39.2 \
+    # 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.56 \
+    # 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
+
+# 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/python2.7/site-packages/libsvn swig_pydir_extra=$VENV_PATH/lib/python2.7/site-packages/svn && \
+   sudo make install-swig-py swig_pydir=$VENV_PATH/lib/python2.7/site-packages/libsvn swig_pydir_extra=$VENV_PATH/lib/python2.7/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 \
+
+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_pinned.txt \
+     -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"
+
+RUN \
+   curl -L $(cat rhodecode-enterprise-ce/requirements.txt | grep rhodecode-tools-ce) -o rhodecode-tools-ce.tar.gz && \
+   tar xfz rhodecode-tools-ce.tar.gz && rm rhodecode-tools-ce.tar.gz && \
+   cd rhodecode_tools-* && $PIP_EXECUTABLE install -r requirements_pinned.txt -r requirements.txt && \
+   cd ../ && rm -rf rhodecode_tools-*
+
+RUN \
+echo "** install rhodecode ${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_pinned.txt \
+    -r /home/$RC_USER/rhodecode-enterprise-ce/requirements.txt && \
+  $PIP_EXECUTABLE install /home/$RC_USER/rhodecode-enterprise-ce && \
+  $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 ${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_DATA_DIR/static && cp -r /home/$RC_USER/.rccontrol/enterprise-1/profile/etc/static/* $RHODECODE_DATA_DIR/static/ && \
+  echo "Done copy config of rhodecode"
+
+
+USER root
+
+RUN \
+echo "**** cleanup ****" && \
+    apt-get remove -y $CLEANUP_DEPS && \
+    apt-get autoclean -y && \
+    rm -rf /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" ]

build_yaml/docker-compose-apps.4.yaml

@@ -1,7 +1,8 b''
+# compose file to build 4.X.X series
+
 volumes:
   bashhistory:
 
-
 services:
 
   rhodecode:
@@ -14,7 +15,7 b' services:'
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_venv3.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4.dockerfile
 
   vcsserver:
     environment:
@@ -25,28 +26,28 b' services:'
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_venv3.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4.dockerfile
 
   celery:
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_venv3.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4.dockerfile
 
   celery-beat:
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_venv3.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4.dockerfile
 
   svn:
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_venv3.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4.dockerfile
 
   sshd:
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_venv3.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4.dockerfile

build_yaml/docker-compose-apps.4_source.yaml

@@ -14,7 +14,7 b' services:'
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_venv.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4_source.dockerfile
 
   vcsserver:
     environment:
@@ -25,28 +25,28 b' services:'
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_venv.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4_source.dockerfile
 
   celery:
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_venv.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4_source.dockerfile
 
   celery-beat:
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_venv.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4_source.dockerfile
 
   svn:
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_venv.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4_source.dockerfile
 
   sshd:
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_venv.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4_source.dockerfile

build_yaml/docker-compose-apps.4_venv.yaml

@@ -14,7 +14,7 b' services:'
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_source.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4_venv.dockerfile
 
   vcsserver:
     environment:
@@ -25,28 +25,28 b' services:'
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_source.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4_venv.dockerfile
 
   celery:
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_source.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4_venv.dockerfile
 
   celery-beat:
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_source.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4_venv.dockerfile
 
   svn:
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_source.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4_venv.dockerfile
 
   sshd:
 
     build:
       context: .
-      dockerfile: service/rhodecode/rhodecode_source.dockerfile
+      dockerfile: service/rhodecode/rhodecode_4_venv.dockerfile

build_yaml/docker-compose-apps.5.yaml

@@ -1,7 +1,8 b''
+# compose file to build 5.X.X series
+
 volumes:
   bashhistory:
 
-
 services:
 
   rhodecode:

service/rhodecode/rhodecode_4.dockerfile

@@ -1,4 +1,5 b''
-# binary-install
+# binary-rccontrol-install
+
 FROM ubuntu:22.04
 # Using 22.04 LTS Release
 MAINTAINER RhodeCode Inc. <[e-mail]>

service/rhodecode/rhodecode_4_source.dockerfile

@@ -1,7 +1,8 b''
-# source-install
+# source-nix-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

service/rhodecode/rhodecode_5.dockerfile

@@ -1,4 +1,4 b''
-# virtualenv-install
+# virtualenv-install for 5.X
 
 FROM ubuntu:22.04
 # Using 22.04 LTS Release
@@ -41,7 +41,7 b' ENV \\'
     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_CORE_MODULES_DIR=/home/rhodecode/apache2/modules \
     MOD_DAV_SVN_MODULE=/home/rhodecode/subversion/libexec/mod_dav_svn.so \
     \
     # SSHD CONFIG