docker: recent changes for build

.env

@@ -1,24 +1,25 b''
 COMPOSE_PROJECT_NAME=rc_cluster
 TZ="UTC"
 
 # Version to deploy and run
 RC_VERSION="4.24.1"
 
 # Database access credentials
 POSTGRES_DB=rhodecode
+POSTGRES_USER=rhodecode
 POSTGRES_PASSWORD=hUc1adS7oDd6Oj3in3
 
 # base url for running app
 RHODECODE_BASE_URL=http://localhost:8888
 
 # HTTP and HTTPS ports for running app
 RC_HTTP_PORT=8888
 RC_HTTPS_PORT=8443
 
 # SSH Port exposed, increased security is to not used default 22
 RC_SSH_PORT=9022
 
 # user/password for first admin user created for access
 RHODECODE_USER_EMAIL=[e-mail]
 RHODECODE_USER_NAME=admin
 RHODECODE_USER_PASS=qweqwe

docker-compose.yaml

@@ -1,392 +1,408 b''
 version: '3.9'
 
 volumes:
 
   # bind volume with logs
   logvolume:
    driver: local
    driver_opts:
     type: none
     o: bind
     device: $PWD/logs
 
   # bind-mount with configs
   confvolume:
    driver: local
    driver_opts:
     type: none
     o: bind
     device: $PWD/config
 
   # volume for rhodecode caches, archive caches, elasticsearch etc
   datavolume: {}
 
-  # postgres store
-  pg_data: {}
+  # volume for RhodeCode repo-store, it's where the repositories will be stored
+  rhodecode_repos:
+    labels:
+      "keep": 1
+
+  # volume for postgres db store
+  pg_data:
+    labels:
+      "keep": 1
 
   # volume for rhodecode elasticsearch
-  es_data: {}
+  es_data:
+    labels:
+      "keep": 1
 
-  # RhodeCode repo-store, it's where the repositories will be stored
-  rhodecode_repos: {}
 
 networks:
   rhodecode_network:
    name: rhodecode_network
 
 services:
 
   rhodecode:
     networks:
       - rhodecode_network
     image: rhodecode/app:${RC_VERSION:?specify-RC_VERSION-env-var}
     stdin_open: true
     tty: true
     restart: unless-stopped
     command: [
       "/var/opt/rhodecode_bin/bin/gunicorn",
-      "--name",
-      "gunicorn-rhodecode-1",
+      "--name=gunicorn-rhodecode-1",
       "--error-logfile=-",
       "--paster=/etc/rhodecode/conf/compose/rhodecode.optimized.ini",
       "--config=/etc/rhodecode/conf/gunicorn_conf.py"
     ]
     ports:
       - "127.0.0.1::10020"
 
     build:
       context: .
       dockerfile: service/rhodecode/rhodecode.dockerfile
-      network: rhodecode_network
+      #network: rhodecode_network
       args:
         TZ: ${TZ}
         RHODECODE_VERSION: ${RC_VERSION:?specify-RC_VERSION-env-var}
         RHODECODE_DB: postgresql://rhodecode:${POSTGRES_PASSWORD:?must-specify-db-password}@database/${POSTGRES_DB:?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
       ENV_RC_BASE_URL: ${RHODECODE_BASE_URL}
       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"
 
       DB_UPGRADE: 1  # run the DB upgrade
       SETUP_APP: 1 # run the application default settings setup, can be turned off after initial run
       MAIN_INI_PATH: /etc/rhodecode/conf/compose/rhodecode.optimized.ini
 
       # SVN Specific
       MOD_DAV_SVN_PORT: 8090
       APACHE_LOG_DIR: /var/log/rhodecode/svn
       MOD_DAV_SVN_CONF_FILE: /etc/rhodecode/conf/svn/mod_dav_svn.conf
 
-
     healthcheck:
       test: [ "CMD", "curl", "-A", "RhodeCode-Healthcheck", "-s", "-o", "/dev/null", "-w", "'%{http_code}'", "http://127.0.0.1:10020/_admin/ops/ping" ]
       timeout: 30s
       interval: 60s
       retries: 10
 
     depends_on:
       - database
       - redis
 
     volumes:
       - confvolume:/etc/rhodecode/conf
       - logvolume:/var/log/rhodecode
       - rhodecode_repos:/var/opt/rhodecode_repo_store
       - datavolume:/var/opt/rhodecode_data
 
     tmpfs:
       - /data_ramdisk:size=1G
 
   vcsserver:
     networks:
       - rhodecode_network
     image: rhodecode/app:${RC_VERSION:?specify-RC_VERSION-env-var}
     stdin_open: true
     tty: true
     restart: unless-stopped
     command: [
        "/home/rhodecode/.rccontrol/vcsserver-1/profile/bin/gunicorn",
        "--name=gunicorn-vcsserver-1",
        "--error-logfile=-",
        "--paster=/etc/rhodecode/conf/compose/vcsserver.optimized.ini",
        "--config=/etc/rhodecode/conf/gunicorn_conf.py"
     ]
     ports:
       - "127.0.0.1::10010"
 
     healthcheck:
       test: [ "CMD", "curl", "-A", "RhodeCode-Healthcheck", "-s", "-o", "/dev/null", "-w", "'%{http_code}'", "http://127.0.0.1:10010/status" ]
       timeout: 30s
       interval: 60s
       retries: 10
 
     environment:
       RC_APP_TYPE: rhodecode_vcsserver
       RC_APP_PROC: 1
       MAIN_INI_PATH: /etc/rhodecode/conf/compose/vcsserver.optimized.ini
       ENV_RC_BASE_URL: ${RHODECODE_BASE_URL}
       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"
 
     depends_on:
       - redis
 
     volumes:
       - confvolume:/etc/rhodecode/conf
       - logvolume:/var/log/rhodecode
       - rhodecode_repos:/var/opt/rhodecode_repo_store
       - datavolume:/var/opt/rhodecode_data
 
   celery:
     networks:
       - rhodecode_network
     image: rhodecode/app:${RC_VERSION:?specify-RC_VERSION-env-var}
     stdin_open: true
     tty: true
     restart: unless-stopped
     command: [
         "/var/opt/rhodecode_bin/bin/celery",
         "worker",
         "--task-events",
         "--autoscale=10,2",
         "--no-color",
         "--app=rhodecode.lib.celerylib.loader",
         "--loglevel=DEBUG",
         "--ini=/etc/rhodecode/conf/compose/rhodecode.optimized.ini"
     ]
 
     environment:
       RC_APP_TYPE: rhodecode_celery
       RC_APP_PROC: 1
       MAIN_INI_PATH: /etc/rhodecode/conf/compose/rhodecode.optimized.ini
       ENV_RC_BASE_URL: ${RHODECODE_BASE_URL}
       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"
 
     depends_on:
       - database
       - redis
 
     volumes:
       - confvolume:/etc/rhodecode/conf
       - logvolume:/var/log/rhodecode
       - rhodecode_repos:/var/opt/rhodecode_repo_store
       - datavolume:/var/opt/rhodecode_data
 
   beat:
     # This service is not scalable
     networks:
       - rhodecode_network
     image: rhodecode/app:${RC_VERSION:?specify-RC_VERSION-env-var}
     stdin_open: true
     tty: true
     restart: unless-stopped
     command: [
       "/var/opt/rhodecode_bin/bin/celery",
       "beat",
       "--no-color",
       "--app=rhodecode.lib.celerylib.loader",
       "--scheduler=rhodecode.lib.celerylib.scheduler.RcScheduler",
       "--loglevel=DEBUG",
       "--ini=/etc/rhodecode/conf/compose/rhodecode.optimized.ini"
     ]
 
     environment:
       RC_APP_TYPE: rhodecode_beat
       RC_APP_PROC: 1
       MAIN_INI_PATH: /etc/rhodecode/conf/compose/rhodecode.optimized.ini
       ENV_RC_BASE_URL: ${RHODECODE_BASE_URL}
       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"
 
     depends_on:
       - database
       - redis
 
     volumes:
       - confvolume:/etc/rhodecode/conf
       - logvolume:/var/log/rhodecode
       - rhodecode_repos:/var/opt/rhodecode_repo_store
       - datavolume:/var/opt/rhodecode_data
 
   svn:
     networks:
       - rhodecode_network
     image: rhodecode/app:${RC_VERSION:?specify-RC_VERSION-env-var}
     stdin_open: true
     tty: true
     restart: unless-stopped
     command: ["apachectl", "-D", "FOREGROUND"]
 
     environment:
       RC_APP_TYPE: rhodecode_svn
 
       # SVN Specific
       MOD_DAV_SVN_PORT: 8090
       APACHE_LOG_DIR: /var/log/rhodecode/svn
       MOD_DAV_SVN_CONF_FILE: /etc/rhodecode/conf/svn/mod_dav_svn.conf
 
     ports:
       - "127.0.0.1::8090"
 
     healthcheck:
       test: [ "CMD", "curl", "-A", "RhodeCode-Healthcheck", "-s", "-o", "/dev/null", "-w", "'%{http_code}'", "http://127.0.0.1:8090/_server_status" ]
       timeout: 30s
       interval: 60s
       retries: 10
 
     volumes:
       - confvolume:/etc/rhodecode/conf
       - logvolume:/var/log/rhodecode
       - rhodecode_repos:/var/opt/rhodecode_repo_store
 
   sshd:
     networks:
       - rhodecode_network
     image: rhodecode/app:${RC_VERSION:?specify-RC_VERSION-env-var}
     stdin_open: true
     tty: true
     restart: unless-stopped
     command: ["/usr/sbin/sshd", "-f", "/etc/rhodecode/sshd_config", "-D", "-e"]
 
     environment:
       RC_APP_TYPE: rhodecode_sshd
       SSH_BOOTSTRAP: 1
 
     ports:
       # set from .env file
       - "${RC_SSH_PORT:?must-specify-ssh-port}:22"
 
     depends_on: {}
 
     volumes:
       - confvolume:/etc/rhodecode/conf
       - logvolume:/var/log/rhodecode
       - rhodecode_repos:/var/opt/rhodecode_repo_store
       - datavolume:/var/opt/rhodecode_data
 
   elasticsearch:
     networks:
       - rhodecode_network
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.8.13
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.8.14
 
     environment:
       - cluster.name=elasticsearch-cluster
       - network.host=0.0.0.0
       - bootstrap.memory_lock=true
       - discovery.type=single-node
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
 
     ulimits:
       memlock:
         soft: -1
         hard: -1
 
     volumes:
       - es_data:/usr/share/elasticsearch/data
 
   channelstream:
     networks:
       - rhodecode_network
     image: channelstream/channelstream:0.7.1
     restart: unless-stopped
 
     ports:
       - "127.0.0.1:9800:9800"
 
     command: ["channelstream", "-i", "/etc/rhodecode/conf/compose/channelstream.ini"]
 
     environment:
       CHANNELSTREAM_ALLOW_POSTING_FROM: 0.0.0.0
 
     healthcheck:
         test: [ "CMD", "curl", "-s", "-o", "/dev/null", "-w", "'%{http_code}'", "http://127.0.0.1:9800/admin/sign_in" ]
         timeout: 30s
         interval: 60s
         retries: 10
 
     volumes:
       - confvolume:/etc/rhodecode/conf
       - logvolume:/var/log/rhodecode
 
   redis:
     networks:
       - rhodecode_network
-    image: rhodecode/redis:6.0.10
+    image: rhodecode/redis:6.2.1
+
     build:
       context: .
       dockerfile: service/redis/rhodecode_redis.dockerfile
       network: rhodecode_network
+      args:
+        REDIS_BUILD: 6.2.1
 
     restart: unless-stopped
 
     ports:
       - "127.0.0.1::6379"
 
     volumes:
       - logvolume:/var/log/rhodecode
 
   database:
     networks:
       - rhodecode_network
-    image: rhodecode/database:13.1
+    image: rhodecode/database:13.2
+
     build:
       context: .
       dockerfile: service/database/rhodecode_database.dockerfile
       network: rhodecode_network
-    restart: unless-stopped
-
-    ports:
-      - "127.0.0.1::5432"
+      args:
+        POSTGRES_BUILD: 13.2
 
     environment:
       POSTGRES_DB: ${POSTGRES_DB:?must-specify-db-name}
-      POSTGRES_USER: rhodecode
+      POSTGRES_USER: ${POSTGRES_USER:?must-specify-db-user}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?must-specify-db-password}
 
+    restart: unless-stopped
+
+    ports:
+      - "127.0.0.1::5432"
+
     volumes:
       # save the pg_data volume
       - pg_data:/var/lib/postgresql/data
       - logvolume:/var/log/rhodecode
 
   nginx:
     networks:
       - rhodecode_network
-    image: rhodecode/nginx:1.19.6
+    image: rhodecode/nginx:1.19.8
+
     build:
       context: .
       dockerfile: service/nginx/rhodecode_nginx.dockerfile
       network: rhodecode_network
+      args:
+        NGINX_BUILD: 1.19.8
+
     restart: unless-stopped
 
     ports:
       # set from .env file
       - "${RC_HTTP_PORT:?must-specify-http-port}:80"
       - "${RC_HTTPS_PORT:?must-specify-https-port}:443"
 
     healthcheck:
       # change port 80 to 443 when only using SSL
       test: [ "CMD", "curl", "-A", "RhodeCode-Healthcheck", "-s", "-o", "/dev/null", "-w", "'%{http_code}'", "http://127.0.0.1:80/_admin/ops/ping" ]
       timeout: 30s
       interval: 60s
       retries: 10
 
     depends_on:
       - channelstream
 
     volumes:
       - confvolume:/etc/rhodecode/conf
       - logvolume:/var/log/rhodecode
 
     volumes_from:
       - rhodecode:ro

service/database/rhodecode_database.dockerfile

@@ -1,4 +1,5 b''
-FROM library/postgres:13.1
+ARG POSTGRES_BUILD
+FROM library/postgres:$POSTGRES_BUILD
 
 COPY service/database/customized.conf /etc/conf.d/pg_customized.conf
 CMD ["postgres", "-c", "log_statement=ddl"]
  No newline at end of file

service/nginx/rhodecode_nginx.dockerfile

@@ -1,13 +1,14 b''
-FROM library/nginx:1.19.6
+ARG NGINX_BUILD
+FROM library/nginx:$NGINX_BUILD
 
 ENV NGINX_ENTRYPOINT_QUIET_LOGS=1
 
 RUN mkdir -p /etc/nginx/sites-enabled/
 RUN mkdir -p /var/log/rhodecode/nginx
 COPY service/nginx/nginx.conf /etc/nginx/nginx.conf
 COPY service/nginx/http.conf /etc/nginx/sites-enabled/http.conf
 COPY service/nginx/proxy.conf /etc/nginx/proxy.conf
 
 VOLUME /var/log/rhodecode
 
 #TODO enable amplify
  No newline at end of file

service/redis/rhodecode_redis.dockerfile

@@ -1,3 +1,4 b''
-FROM library/redis:6.0.9
+ARG REDIS_BUILD
+FROM library/redis:$REDIS_BUILD
 COPY service/redis/redis.conf /etc/redis/redis-rc.conf
 CMD ["redis-server", "/etc/redis/redis-rc.conf"]

service/rhodecode/rhodecode.dockerfile

@@ -1,245 +1,254 b''
 FROM ubuntu:groovy
 MAINTAINER RhodeCode Inc. <[e-mail]>
 
 ARG TZ="UTC"
 ARG LOCALE_TYPE=en_US.UTF-8
 ARG RHODECODE_TYPE=Enterprise
+# binary-install
 ARG RHODECODE_VERSION=4.24.1
+
 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 \
     \
     # SSHD CONFIG
     SSHD_CONF_FILE=/etc/rhodecode/sshd_config \
     \
     BUILD_CONF=/etc/rhodecode/conf_build \
     BUILD_BIN_DIR=/var/opt/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
 
 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 \
 	; \
 	rm -rf /var/lib/apt/lists/*;
 
 RUN \
 echo "** Configure the python executable for py2/3 compat **" && \
 ISPY=$(which python3 || which python2) && \
 if [ -n $ISPY ] ; then ln -s $ISPY /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
+  useradd --system --gid $RC_USER --uid 999 --shell /bin/bash $RC_USER && \
+  usermod -G $RC_USER $RC_USER
 
 # 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 /var/opt/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/ && \
   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/* /home/$RC_USER/.rccontrol/cache/
-COPY --chown=$RC_USER:$RC_USER service/rhodecode/bootstrap/* /home/$RC_USER/.rccontrol/bootstrap/
 COPY --chown=$RC_USER:$RC_USER config/compose/rhodecode_enterprise.license /home/$RC_USER/.rccontrol/bootstrap/
+COPY --chown=$RC_USER:$RC_USER service/rhodecode/bootstrap/* /home/$RC_USER/.rccontrol/bootstrap/
 
 RUN \
 echo "**** locale-archive path ****" && \
     mv -v /home/$RC_USER/.rccontrol/cache/locale-archive /var/opt/locale-archive
 
 # 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/
+  cp -v /home/$RC_USER/.rccontrol-profile/etc/ca-bundle.crt $BUILD_CONF/ && \
+  echo "Done"
 
 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 && \
-  cp -v ${VCSSERVER_PATH}/vcsserver.ini $BUILD_CONF/
+  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
 
 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} && \
-    cp -v ${RHODECODE_PATH}/rhodecode.ini $BUILD_CONF/ && \
-    cp -v ${RHODECODE_PATH}/search_mapping.ini $BUILD_CONF/ && \
-    cp -v ${RHODECODE_PATH}/gunicorn_conf.py $BUILD_CONF/ && \
-    rm -rf $BUILD_BIN_DIR/bin && ln -s ${RHODECODE_PATH}/profile/bin $BUILD_BIN_DIR && \
-    mkdir -p $RHODECODE_DATA_DIR/static && cp -r ${RHODECODE_PATH}/public/* $RHODECODE_DATA_DIR/static/ && \
-    rm ${RHODECODE_PATH}/rhodecode.db
+  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.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
 
 
 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
+  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"
 
 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-installer-* && \
     rm -f /home/$RC_USER/.rccontrol/cache/*.bz2 && \
     rm -rf /var/lib/apt/lists/* \
     rm -rf /var/cache/apk/* \
     rm ${SUPERVISOR_CONF}
 
 # 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
 
 # logs volume
 VOLUME /var/log/rhodecode
 
 ENTRYPOINT ["/opt/entrypoints.d/entrypoint.sh"]
 
 # compose can override this
 CMD ["supervisord", "--nodaemon", "-c", "/etc/rhodecode/conf/supervisord.ini"]