docker: updated to 4.25.0

.bootstrap/download-artifacts.sh

@@ -4,6 +4,8 b" IFS=$'\\n\\t'"
 # e.g 4.24.1
 source ../.env
 VER=$RC_VERSION
+AUTH=""
+
 INSTALLER_URL=https://dls.rhodecode.com/dls/N2E2ZTY1NzA3NjYxNDA2NTc1NjI3MTcyNzA2MjcxNzIyZTcwNjI3YQ==/rhodecode-control/latest-linux-ee
 
 echo "Downloading Artifacts for version: $VER"
@@ -12,6 +14,8 b' MANIFEST=https://dls.rhodecode.com/linux/MANIFEST'
 CACHE_DIR=../.cache
 VER_REGEX="$VER+x86_64"
 
+echo "Downloading Artifacts for version: $VER"
+
 echo "Downloading locale-archive"
 curl -L https://dls.rhodecode.com/assets/locale-archive -J -O
 mv -v locale-archive $CACHE_DIR
@@ -23,7 +27,8 b' echo "Found following $ARTS"'
 
 for url in $ARTS; do
     echo "Downloading $url"
-    curl -L ${url} -J -O
+    curl $AUTH -L ${url} -J -O
+
 done
 
 ## rhodecode control
@@ -43,3 +48,4 b' fi'
 
 mv -v "${INSTALLER}" $CACHE_DIR
 mv -v *.bz2 $CACHE_DIR
+ls -lh $CACHE_DIR
  No newline at end of file

.env

@@ -2,12 +2,12 b' COMPOSE_PROJECT_NAME=rc_cluster'
 TZ="UTC"
 
 # Version to deploy and run
-RC_VERSION="4.24.1"
+RC_VERSION="4.25.0"
 
 # Database access credentials
-POSTGRES_DB=rhodecode
-POSTGRES_USER=rhodecode
-POSTGRES_PASSWORD=hUc1adS7oDd6Oj3in3
+DB_NAME=rhodecode
+DB_USER=rhodecode
+DB_PASSWORD=hUc1adS7oDd6Oj3in3
 
 # base url for running app
 RHODECODE_BASE_URL=http://localhost:8888

README.md

@@ -25,7 +25,38 b' Visit docker site and install docker (min version 20.10) and docker compose:'
 - https://docs.docker.com/compose/install/
 
 
-# Installation steps
+## Data structure
+
+There are 4 volumes defined:
+
+
+- `/etc/rhodecode/conf`
+  
+  Used for configuration files for rhodecode, vcsserver and supervisord, and some cache data
+
+- `/var/opt/rhodecode_repo_store` 
+
+   Used for main repository storage where repositories would be stored
+  
+- `/var/opt/rhodecode_data` 
+  
+   data dir for rhodecode cache/lock files, or user sessions (for file backend)
+
+- `/var/log/rhodecode`
+
+   Used to store all logs from RhodeCode
+
+
+## Setup/Build options
+
+There are 3 options to run the docker stack.
+
+- [Standalone cluster build from installer](#standalone-cluster-build-from-installer) 
+- [Standalone cluster build from source](#like-this-one) 
+- [dev enviroment setup](#like-this-one)
+
+
+# Standalone cluster build from installer
 
 Follow these steps to build and run the RhodeCode Cluster via Docker-compose.
 Get the repository:
@@ -38,7 +69,9 b' First start by fetching required installer binaries. This is required to create '
 simple build and full compose setup.
 Please check the `.env` file to adjust the version if needed.
 
-`cd .boostrap/; ./download-artifacts.sh; cd ../`
+```shell
+cd .bootstrap/; ./download-artifacts.sh; cd ../
+```
 
 This will download required files and put them into the `.cache` directory. 
 This directory should look similar to that after downloads have finish:
@@ -61,7 +94,6 b' This setup would use a provided license from a file'
 please save the license data inside this file, so it will be applied at creation.
 This file can also be empty and license can be applied via a WEB interface.
 
-
 ## Run Docker compose build:
 
 To create a full stack we need to run the database container, so it's ready to
@@ -73,19 +105,27 b' build the docker image.'
     docker-compose up --detach database
     ```
    
-    This will start our postgres database, and expose it to the network. 
-    We can now run the full installation. Database needs to be running for the next build command.
+    This will start our postgres database, and expose it to the network.
+
+2) We can now run the full installation. Database needs to be running for the next build command.
     
     ```shell
     docker-compose build rhodecode
     docker-compose build
     ```
 
-Once we build the rhodecode app, we can run the whole stack using `docker-compose up`
+    _Disk space problems?_
+       
+    ```shell
+    docker system df
+    docker builder prune
+    ```
 
-```shell
-docker-compose up
-```
+3) Once we build the rhodecode app, we can run the whole stack using `docker-compose up`
+
+    ```shell
+    docker-compose up
+    ```
 
 You can access Running RhodeCode under via Nginx under:
 http://localhost:8888
@@ -97,17 +137,6 b' In case for bigger setups docker-compose can scale more rhodecode/vcsserver work'
 docker-compose up --scale vcsserver=3 rhodecode=3
 ```
 
-## Data structure
-
-There are 4 volumes defined:
-
-- `/var/log/rhodecode` # all logs from RhodeCode are saved in this volume
-- `/etc/rhodecode/conf` # storing configuration files for rhodecode, vcsserver and supervisord, and some cache data
-- `/var/opt/rhodecode_repo_store` # main repository storage where repositories would be stored
-- `/var/opt/rhodecode_data` # data dir for rhodecode cache/lock files, or user sessions (for file backend)
-
-
-
 
 Upgrade:
 
@@ -118,17 +147,22 b' Upgrade:'
 - docker-compose stop
 - docker-compose up
 
+# Standalone cluster build from source
 
+There's an option to build the latest branches as a docker installation.
+- Download the source:
 
+```shell
+cd .boostrap/; ./download-source.sh; cd ../
+```
 
+Build the source based image
 
+```shell
+    docker-compose -f docker-compose.yaml -f docker-compose-source.yaml build --no-cache --progress=plain rhodecode
+```
 
-
-
-
-
-
-
+to create a source install override and build based on the downloaded sources.
 
 
 

docker-compose.yaml

@@ -26,11 +26,16 b' volumes:'
     labels:
       "keep": 1
 
-  # volume for postgres db store
+  # volume for Postgres db store
   pg_data:
     labels:
       "keep": 1
 
+  # volume for MySQL db store
+  mysql_data:
+    labels:
+      "keep": 1
+
   # volume for rhodecode elasticsearch
   es_data:
     labels:
@@ -63,11 +68,10 b' services:'
     build:
       context: .
       dockerfile: service/rhodecode/rhodecode.dockerfile
-      #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_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}
@@ -83,6 +87,8 b' services:'
 
       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/compose/rhodecode.optimized.ini
 
       # SVN Specific
@@ -327,14 +333,13 b' services:'
   redis:
     networks:
       - rhodecode_network
-    image: rhodecode/redis:6.2.1
+    image: rhodecode/redis:6.2.4
 
     build:
       context: .
       dockerfile: service/redis/rhodecode_redis.dockerfile
-      network: rhodecode_network
       args:
-        REDIS_BUILD: 6.2.1
+        REDIS_BUILD: 6.2.4
 
     restart: unless-stopped
 
@@ -343,23 +348,23 b' services:'
 
     volumes:
       - logvolume:/var/log/rhodecode
+      - datavolume:/var/opt/rhodecode_data
 
   database:
     networks:
       - rhodecode_network
-    image: rhodecode/database:13.2
+    image: rhodecode/database:13.3
 
     build:
       context: .
       dockerfile: service/database/rhodecode_database.dockerfile
-      network: rhodecode_network
       args:
-        POSTGRES_BUILD: 13.2
+        POSTGRES_BUILD: 13.3
 
     environment:
-      POSTGRES_DB: ${POSTGRES_DB:?must-specify-db-name}
-      POSTGRES_USER: ${POSTGRES_USER:?must-specify-db-user}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?must-specify-db-password}
+      POSTGRES_DB: ${DB_NAME:?must-specify-db-name}
+      POSTGRES_USER: ${DB_USER:?must-specify-db-user}
+      POSTGRES_PASSWORD: ${DB_PASSWORD:?must-specify-db-password}
 
     restart: unless-stopped
 
@@ -371,17 +376,44 b' services:'
       - pg_data:/var/lib/postgresql/data
       - logvolume:/var/log/rhodecode
 
+  database-mysql:
+      networks:
+        - rhodecode_network
+
+      image: rhodecode/database_mysql:8.0.25
+
+      build:
+        context: .
+        dockerfile: service/database/rhodecode_database_mysql.dockerfile
+        args:
+          MYSQL_BUILD: 8.0.24
+
+      environment:
+        MYSQL_DATABASE: ${DB_NAME:?must-specify-db-name}
+        MYSQL_USER: ${DB_USER:?must-specify-db-user}
+        MYSQL_PASSWORD: ${DB_PASSWORD:?must-specify-db-password}
+        MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:?must-specify-db-password}
+
+      restart: unless-stopped
+
+      ports:
+        - "127.0.0.1::3306"
+
+      volumes:
+        # save the mysql_data volume
+        - mysql_data:/var/lib/mysql
+        - logvolume:/var/log/rhodecode
+
   nginx:
     networks:
       - rhodecode_network
-    image: rhodecode/nginx:1.19.8
+    image: rhodecode/nginx:1.21.1
 
     build:
       context: .
       dockerfile: service/nginx/rhodecode_nginx.dockerfile
-      network: rhodecode_network
       args:
-        NGINX_BUILD: 1.19.8
+        NGINX_BUILD: 1.21.1
 
     restart: unless-stopped
 

entrypoints.d/entrypoint.sh

@@ -92,7 +92,11 b' esac'
 if [[ $RC_APP_TYPE = "rhodecode_http" ]]; then
 
   DB_INIT_FILE=/var/opt/rhodecode_data/.dbinit_bootstrapped
-  # Avoid DB_INIT to run 2x
+  if [ "$FORCE_DB_INIT_FILE" = 1 ]; then
+    rm $DB_INIT_FILE
+  fi
+
+  # Avoid DB_INIT to run multiple times
   if [[ ! -e $DB_INIT_FILE ]]; then
     echo "ENTRYPOINT: Starting $RC_APP_TYPE initial db bootstrap"
 
@@ -103,9 +107,13 b' if [[ $RC_APP_TYPE = "rhodecode_http" ]]; then'
 
   fi
 
-  BOOTSTRAP_FILE=/var/opt/rhodecode_data/.setup_bootstrapped
+  RC_SETUP_FILE=/var/opt/rhodecode_data/.setup_bootstrapped
+  if [ "$FORCE_RC_SETUP_APP" = 1 ]; then
+    rm $RC_SETUP_FILE
+  fi
+
   # Avoid destroying bootstrapping by simple start/stop
-  if [[ ! -e $BOOTSTRAP_FILE ]]; then
+  if [[ ! -e $RC_SETUP_FILE ]]; then
     echo "ENTRYPOINT: Starting $RC_APP_TYPE initial bootstrap"
 
     # copy over default configuration files
@@ -116,8 +124,8 b' if [[ $RC_APP_TYPE = "rhodecode_http" ]]; then'
       rhodecode_setup
     fi
 
-    gosu $RC_USER touch "$BOOTSTRAP_FILE"
-    echo "ENTRYPOINT: marked as setup-bootstrapped at $BOOTSTRAP_FILE"
+    gosu $RC_USER touch "$RC_SETUP_FILE"
+    echo "ENTRYPOINT: marked as setup-bootstrapped at $RC_SETUP_FILE"
 
   fi
 

service/redis/redis.conf

@@ -339,7 +339,7 b' rdbcompression yes'
 rdbchecksum yes
 
 # The filename where to dump the DB
-dbfilename dump.rdb
+dbfilename redis_dump.rdb
 
 # Remove RDB files used by replication in instances without persistence
 # enabled. By default this option is disabled, however there are environments
@@ -362,7 +362,7 b' rdb-del-sync-files no'
 # The Append Only File will also be created inside this directory.
 #
 # Note that you must specify a directory here, not a file name.
-dir ./
+dir /var/opt/rhodecode_data/
 
 ################################# REPLICATION #################################
 

service/rhodecode/rhodecode.dockerfile

@@ -1,3 +1,4 b''
+# 20.10
 FROM ubuntu:groovy
 MAINTAINER RhodeCode Inc. <[e-mail]>
 
@@ -5,7 +6,7 b' ARG TZ="UTC"'
 ARG LOCALE_TYPE=en_US.UTF-8
 ARG RHODECODE_TYPE=Enterprise
 # binary-install
-ARG RHODECODE_VERSION=4.24.1
+ARG RHODECODE_VERSION=4.25.0
 
 ARG RHODECODE_DB=sqlite
 ARG RHODECODE_USER_NAME=admin
@@ -60,6 +61,7 b' ENV \\'
 ENV SVN_LOCALE_DEPS apache2 apache2-utils libapache2-mod-svn
 ENV SSH_LOCALE_DEPS openssh-server
 ENV PYTHON_DEPS python2
+ENV EXTRA_DEPS ""
 
 RUN \
 echo "** install base packages **" && \
@@ -83,6 +85,7 b' set -eux; \\'
         $PYTHON_DEPS \
         $SSH_LOCALE_DEPS \
         $SVN_LOCALE_DEPS \
+        $EXTRA_DEPS \
 	; \
 	rm -rf /var/lib/apt/lists/*;
 
@@ -168,6 +171,7 b' echo "**** Apache config ****" && \\'
 
 
 # Copy artifacts
+
 COPY --chown=$RC_USER:$RC_USER .cache/* /home/$RC_USER/.rccontrol/cache/
 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/