##// END OF EJS Templates
rccontrol: various fixes...
super-admin -
Show More
@@ -16,8 +16,6 b' services:'
16 context: .
16 context: .
17 dockerfile: service/rhodecode/rhodecode_source.dockerfile
17 dockerfile: service/rhodecode/rhodecode_source.dockerfile
18
18
19 image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}_SOURCE
20
21 vcsserver:
19 vcsserver:
22 environment:
20 environment:
23 HISTFILE: /home/rhodecode/.bash_history_docker
21 HISTFILE: /home/rhodecode/.bash_history_docker
@@ -29,36 +27,26 b' services:'
29 context: .
27 context: .
30 dockerfile: service/rhodecode/rhodecode_source.dockerfile
28 dockerfile: service/rhodecode/rhodecode_source.dockerfile
31
29
32 image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}_SOURCE
33
34 celery:
30 celery:
35
31
36 build:
32 build:
37 context: .
33 context: .
38 dockerfile: service/rhodecode/rhodecode_source.dockerfile
34 dockerfile: service/rhodecode/rhodecode_source.dockerfile
39
35
40 image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}_SOURCE
41
42 celery-beat:
36 celery-beat:
43
37
44 build:
38 build:
45 context: .
39 context: .
46 dockerfile: service/rhodecode/rhodecode_source.dockerfile
40 dockerfile: service/rhodecode/rhodecode_source.dockerfile
47
41
48 image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}_SOURCE
49
50 svn:
42 svn:
51
43
52 build:
44 build:
53 context: .
45 context: .
54 dockerfile: service/rhodecode/rhodecode_source.dockerfile
46 dockerfile: service/rhodecode/rhodecode_source.dockerfile
55
47
56 image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}_SOURCE
57
58 sshd:
48 sshd:
59
49
60 build:
50 build:
61 context: .
51 context: .
62 dockerfile: service/rhodecode/rhodecode_source.dockerfile
52 dockerfile: service/rhodecode/rhodecode_source.dockerfile
63
64 image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}_SOURCE No newline at end of file
@@ -269,6 +269,7 b' services:'
269 restart: always
269 restart: always
270 env_file:
270 env_file:
271 - ${RC_ENV_FILE:?must-specify-rc-env-file}
271 - ${RC_ENV_FILE:?must-specify-rc-env-file}
272
272 command: ["apachectl", "-D", "FOREGROUND"]
273 command: ["apachectl", "-D", "FOREGROUND"]
273
274
274 environment:
275 environment:
@@ -212,7 +212,7 b' services:'
212 - logvolume:/var/log/rhodecode
212 - logvolume:/var/log/rhodecode
213
213
214 profiles:
214 profiles:
215 ["postgres"]
215 ["postgres", "database"]
216
216
217 logging:
217 logging:
218 *custom-logging
218 *custom-logging
@@ -138,15 +138,19 b' if [[ $RC_APP_TYPE = "rhodecode_http" ]]; then'
138 fi
138 fi
139
139
140
140
141 if [[ $RC_APP_TYPE = "rhodecode_sshd" ]]; then
142 # Fix problem with Missing privilege separation directory error
143 mkdir -p /run/sshd
144 fi
145
146 if [[ $RC_APP_TYPE = "rhodecode_svn" ]]; then
147 set -- tini -- "$@"
148 fi
149
141 if [ "$RC_APP_PROC" = 1 ]; then
150 if [ "$RC_APP_PROC" = 1 ]; then
142 # Fix problem with zombie processes when using executables like supervisord/gunicorn
151 # Fix problem with zombie processes when using executables like supervisord/gunicorn
143 set -- tini -- "$@"
152 set -- tini -- "$@"
144 set -- gosu $RC_USER "$@"
153 set -- gosu $RC_USER "$@"
145 fi
154 fi
146
155
147 if [ "$RC_APP_TYPE" = "rhodecode_sshd" ]; then
148 # Fix problem with Missing privilege separation directory error
149 mkdir -p /run/sshd
150 fi
151
152 exec "$@"
156 exec "$@"
This diff has been collapsed as it changes many lines, (632 lines changed) Show them Hide them
@@ -80,6 +80,12 b' rccontrol_usage() {'
80 printf "Environment Variables:\n"
80 printf "Environment Variables:\n"
81
81
82 # :environment_variable.usage
82 # :environment_variable.usage
83 echo " RC_CLI_VERSION_NAME"
84 printf " default version to build and install\n"
85 printf " Default: 4.28.0.REL.2022.12.20.2\n"
86 echo
87
88 # :environment_variable.usage
83 echo " RCC_CONFIG"
89 echo " RCC_CONFIG"
84 printf " default config file for rccontrol\n"
90 printf " default config file for rccontrol\n"
85 printf " Default: .rccontrol.ini\n"
91 printf " Default: .rccontrol.ini\n"
@@ -91,12 +97,6 b' rccontrol_usage() {'
91 echo
97 echo
92
98
93 # :environment_variable.usage
99 # :environment_variable.usage
94 echo " RC_CLI_VERSION_NAME"
95 printf " default version to build and install\n"
96 printf " Default: 4.27.0\n"
97 echo
98
99 # :environment_variable.usage
100 echo " RC_STACK_ROUTER_EXT"
100 echo " RC_STACK_ROUTER_EXT"
101 printf "\n"
101 printf "\n"
102 printf " Default: .custom/docker-compose-router.override.yaml\n"
102 printf " Default: .custom/docker-compose-router.override.yaml\n"
@@ -674,8 +674,8 b' rccontrol_stack_status_usage() {'
674
674
675 # :command.usage_flags
675 # :command.usage_flags
676 # :flag.usage
676 # :flag.usage
677 echo " --simple, -s"
677 echo " --detailed"
678 printf " Display a simple format using a table\n"
678 printf " Display a detailed format\n"
679 echo
679 echo
680
680
681 fi
681 fi
@@ -694,8 +694,131 b' rccontrol_stack_upgrade_usage() {'
694 fi
694 fi
695
695
696 printf "Usage:\n"
696 printf "Usage:\n"
697 printf " rccontrol stack-upgrade\n"
697 printf " rccontrol stack-upgrade COMMAND\n"
698 printf " rccontrol stack-upgrade --help | -h\n"
698 printf " rccontrol stack-upgrade [COMMAND] --help | -h\n"
699 echo
700 # :command.usage_commands
701 printf "Commands:\n"
702 echo " router upgrade the router stack"
703 echo " metrics run the router stack"
704 echo " services run the router stack"
705 echo " rhodecode run the router stack"
706 echo
707
708 # :command.long_usage
709 if [[ -n $long_usage ]]; then
710 printf "Options:\n"
711
712 # :command.usage_fixed_flags
713 echo " --help, -h"
714 printf " Show this help\n"
715 echo
716
717 fi
718 }
719
720 # :command.usage
721 rccontrol_stack_upgrade_router_usage() {
722 if [[ -n $long_usage ]]; then
723 printf "rccontrol stack-upgrade router - upgrade the router stack\n"
724 echo
725
726 else
727 printf "rccontrol stack-upgrade router - upgrade the router stack\n"
728 echo
729
730 fi
731
732 printf "Usage:\n"
733 printf " rccontrol stack-upgrade router\n"
734 printf " rccontrol stack-upgrade router --help | -h\n"
735 echo
736
737 # :command.long_usage
738 if [[ -n $long_usage ]]; then
739 printf "Options:\n"
740
741 # :command.usage_fixed_flags
742 echo " --help, -h"
743 printf " Show this help\n"
744 echo
745
746 fi
747 }
748
749 # :command.usage
750 rccontrol_stack_upgrade_metrics_usage() {
751 if [[ -n $long_usage ]]; then
752 printf "rccontrol stack-upgrade metrics - run the router stack\n"
753 echo
754
755 else
756 printf "rccontrol stack-upgrade metrics - run the router stack\n"
757 echo
758
759 fi
760
761 printf "Usage:\n"
762 printf " rccontrol stack-upgrade metrics\n"
763 printf " rccontrol stack-upgrade metrics --help | -h\n"
764 echo
765
766 # :command.long_usage
767 if [[ -n $long_usage ]]; then
768 printf "Options:\n"
769
770 # :command.usage_fixed_flags
771 echo " --help, -h"
772 printf " Show this help\n"
773 echo
774
775 fi
776 }
777
778 # :command.usage
779 rccontrol_stack_upgrade_services_usage() {
780 if [[ -n $long_usage ]]; then
781 printf "rccontrol stack-upgrade services - run the router stack\n"
782 echo
783
784 else
785 printf "rccontrol stack-upgrade services - run the router stack\n"
786 echo
787
788 fi
789
790 printf "Usage:\n"
791 printf " rccontrol stack-upgrade services\n"
792 printf " rccontrol stack-upgrade services --help | -h\n"
793 echo
794
795 # :command.long_usage
796 if [[ -n $long_usage ]]; then
797 printf "Options:\n"
798
799 # :command.usage_fixed_flags
800 echo " --help, -h"
801 printf " Show this help\n"
802 echo
803
804 fi
805 }
806
807 # :command.usage
808 rccontrol_stack_upgrade_rhodecode_usage() {
809 if [[ -n $long_usage ]]; then
810 printf "rccontrol stack-upgrade rhodecode - run the router stack\n"
811 echo
812
813 else
814 printf "rccontrol stack-upgrade rhodecode - run the router stack\n"
815 echo
816
817 fi
818
819 printf "Usage:\n"
820 printf " rccontrol stack-upgrade rhodecode [OPTIONS]\n"
821 printf " rccontrol stack-upgrade rhodecode --help | -h\n"
699 echo
822 echo
700
823
701 # :command.long_usage
824 # :command.long_usage
@@ -707,6 +830,13 b' rccontrol_stack_upgrade_usage() {'
707 printf " Show this help\n"
830 printf " Show this help\n"
708 echo
831 echo
709
832
833 # :command.usage_flags
834 # :flag.usage
835 echo " --stop-wait STOP_WAIT"
836 printf " Number of seconds to wait for stopping old containers\n"
837 printf " Default: 120\n"
838 echo
839
710 fi
840 fi
711 }
841 }
712
842
@@ -1480,24 +1610,61 b' rccontrol_self_update_command() {'
1480 revision=${args[--revision]}
1610 revision=${args[--revision]}
1481
1611
1482 FETCH_FROM=$SERVER_URL/rhodecode-enterprise-docker/raw/master/scripts/rccontrol/rccontrol
1612 FETCH_FROM=$SERVER_URL/rhodecode-enterprise-docker/raw/master/scripts/rccontrol/rccontrol
1483 TARGET=$PWD/scripts/rccontrol/rccontrol
1484
1613
1485 version_old=$($TARGET --version)
1614 FINAL_TARGET=$PWD/scripts/rccontrol/rccontrol
1615 DL_TARGET=$PWD/scripts/rccontrol/rccontrol.tmp
1616
1617 version_old=$($FINAL_TARGET --version)
1618 rc_version_old=$(echo $RC_CLI_VERSION_NAME)
1486
1619
1487 echo "$(green self-update: downloading new rccontrol script from $FETCH_FROM)"
1620 echo "$(green self-update: downloading new rccontrol script from $FETCH_FROM)"
1488 curl --fail --header "X-Rc-Auth-Token: $AUTH_TOKEN" -o $TARGET -L $FETCH_FROM
1621 curl --fail --header "X-Rc-Auth-Token: $AUTH_TOKEN" -o $DL_TARGET -L $FETCH_FROM
1489 chmod +x $TARGET
1622 chmod +x $DL_TARGET
1623
1624 version_dl=$($DL_TARGET --version)
1625 rc_version_dl=$(echo $RC_CLI_VERSION_NAME)
1490
1626
1491 version_dl=$($TARGET --version)
1627 echo "self-update: rccontrol version downloaded: $version_dl"
1492 echo "self-update: version downloaded: $version_dl"
1493
1628
1494 if [[ $version_old == $version_dl ]]; then
1629 if [[ $version_old == $version_dl ]]; then
1495 echo "$(yellow self-update: no new version available, latest seems to be $version_dl)"
1630 echo "$(yellow self-update: downloaded version is the same as current version ($version_dl))"
1496 exit
1631 exit
1632 fi
1633
1634 .env --file $RUNTIME_ENV
1635 .env get RC_VERSION
1636
1637 ENV_VER=$REPLY
1638
1639 if [[ $DEBUG ]]; then
1640 echo "env version $ENV_VER"
1641 echo "Old Version: $rc_version_old"
1642 echo "Current RC VERSION: $rc_version_dl"
1643 fi
1644
1645 if [[ $rc_version_old == $rc_version_dl ]]; then
1646 echo "$(yellow self-update: latest RC_VERSION=$rc_version_dl seems to be up-to date)"
1497 else
1647 else
1498 echo "$(green self-update: update to new version: $version_dl)"
1648 echo "$(green self-update: setting new RC_VERSION to runtime.env: $rc_version_dl)"
1649
1650 while true; do
1651 read -p "self-update: Would you like to continue with setting RC_VERSION=$rc_version_dl into .runtime.env file? [yn] " yn
1652 case $yn in
1653 [Yy]*)
1654 .env set RC_VERSION=$rc_version_dl
1655 echo "self-update: new version set into config"
1656 return 2 ;;
1657 [Nn]*)
1658 exit ;;
1659 *) echo "Please answer y or n." ;;
1660 esac
1661 done
1662
1499 fi
1663 fi
1500
1664
1665 echo "$(green self-update: update to new version: $version_dl)"
1666 rm $FINAL_TARGET && mv -v $DL_TARGET $FINAL_TARGET
1667
1501 get_docker_definitions $revision
1668 get_docker_definitions $revision
1502
1669
1503 exit
1670 exit
@@ -1802,6 +1969,7 b' rccontrol_get_build_source_command() {'
1802 # src/get_build_source_command.sh
1969 # src/get_build_source_command.sh
1803 check_bootstrap
1970 check_bootstrap
1804
1971
1972 DEBUG=${args[--debug]}
1805 AUTH_TOKEN=${args[--auth-token]}
1973 AUTH_TOKEN=${args[--auth-token]}
1806 SERVER_URL=${args[--server-url]}
1974 SERVER_URL=${args[--server-url]}
1807 revision=${args[--revision]}
1975 revision=${args[--revision]}
@@ -1813,16 +1981,16 b' rccontrol_get_build_source_command() {'
1813 RHODECODE_EE_HASH=$revision
1981 RHODECODE_EE_HASH=$revision
1814
1982
1815 # download sources
1983 # download sources
1816 echo "** download rhodecode source for build from $SERVER_URL using '$revision' hash**"
1984 echo "** download rhodecode source for build from $SERVER_URL using '$revision' hash **"
1817
1985
1818 echo "getting $SERVER_URL/rhodecode-vcsserver/archive/$RHODECODE_VCS_HASH.tgz"
1986 echo "getting $SERVER_URL/rhodecode-vcsserver/archive/$RHODECODE_VCS_HASH.tgz"
1819 curl --header "X-Rc-Auth-Token: $AUTH_TOKEN" -L $SERVER_URL/rhodecode-vcsserver/archive/$RHODECODE_VCS_HASH.tgz?with_hash=0 | tar -xz -C $SOURCE_DIR
1987 curl --fail --header "X-Rc-Auth-Token: $AUTH_TOKEN" -L $SERVER_URL/rhodecode-vcsserver/archive/$RHODECODE_VCS_HASH.tgz?with_hash=0 | tar -xz -C $SOURCE_DIR
1820
1988
1821 echo "getting $SERVER_URL/rhodecode-enterprise-ce/archive/$RHODECODE_CE_HASH.tgz"
1989 echo "getting $SERVER_URL/rhodecode-enterprise-ce/archive/$RHODECODE_CE_HASH.tgz"
1822 curl --header "X-Rc-Auth-Token: $AUTH_TOKEN" -L $SERVER_URL/rhodecode-enterprise-ce/archive/$RHODECODE_CE_HASH.tgz?with_hash=0 | tar -xz -C $SOURCE_DIR
1990 curl --fail --header "X-Rc-Auth-Token: $AUTH_TOKEN" -L $SERVER_URL/rhodecode-enterprise-ce/archive/$RHODECODE_CE_HASH.tgz?with_hash=0 | tar -xz -C $SOURCE_DIR
1823
1991
1824 echo "getting $SERVER_URL/rhodecode-enterprise-ee/archive/$RHODECODE_EE_HASH.tgz"
1992 echo "getting $SERVER_URL/rhodecode-enterprise-ee/archive/$RHODECODE_EE_HASH.tgz"
1825 curl --header "X-Rc-Auth-Token: $AUTH_TOKEN" -L $SERVER_URL/rhodecode-enterprise-ee/archive/$RHODECODE_EE_HASH.tgz?with_hash=0 | tar -xz -C $SOURCE_DIR
1993 curl --fail --header "X-Rc-Auth-Token: $AUTH_TOKEN" -L $SERVER_URL/rhodecode-enterprise-ee/archive/$RHODECODE_EE_HASH.tgz?with_hash=0 | tar -xz -C $SOURCE_DIR
1826
1994
1827 rm -rf $SOURCE_DIR/rhodecode-vcsserver && \
1995 rm -rf $SOURCE_DIR/rhodecode-vcsserver && \
1828 mv $SOURCE_DIR/*rhodecode-vcsserver-plain $SOURCE_DIR/rhodecode-vcsserver
1996 mv $SOURCE_DIR/*rhodecode-vcsserver-plain $SOURCE_DIR/rhodecode-vcsserver
@@ -1932,7 +2100,7 b' rccontrol_stack_services_command() {'
1932 RC_STACK_SERVICES_EXT_LCL="-f $RC_STACK_SERVICES_EXT"
2100 RC_STACK_SERVICES_EXT_LCL="-f $RC_STACK_SERVICES_EXT"
1933 fi
2101 fi
1934
2102
1935 RC_STACK_PROFILES="--profile postgres --profile redis --profile elasticsearch --profile channelstream"
2103 RC_STACK_PROFILES="--profile database --profile redis --profile elasticsearch --profile channelstream"
1936
2104
1937 CMD_SERVICES="\
2105 CMD_SERVICES="\
1938 RC_ENV_FILE=$ENV_FILE docker compose \
2106 RC_ENV_FILE=$ENV_FILE docker compose \
@@ -2016,7 +2184,7 b' rccontrol_stack_status_command() {'
2016 # src/stack_status_command.sh
2184 # src/stack_status_command.sh
2017 check_bootstrap
2185 check_bootstrap
2018 DEBUG=${args[--debug]}
2186 DEBUG=${args[--debug]}
2019 SIMPLE=${args[--simple]}
2187 DETAILED=${args[--detailed]}
2020
2188
2021 if [[ $DEBUG ]]; then
2189 if [[ $DEBUG ]]; then
2022 echo "---"
2190 echo "---"
@@ -2034,34 +2202,145 b' rccontrol_stack_status_command() {'
2034 echo "---"
2202 echo "---"
2035 fi
2203 fi
2036
2204
2037 if [[ $SIMPLE ]]; then
2205 if [[ $DETAILED ]]; then
2038 docker ps --filter=name=rc_cluster --format "table {{.ID}}\t{{.Names}}\t{{.Image}}\t{{.Status}}\t{{.Ports}}" | (read -r; printf "%s\n" "$REPLY"; sort -k 2 )
2039 else
2040 ps_cmd=$(docker ps --filter=name=rc_cluster --format="{{.ID}}")
2206 ps_cmd=$(docker ps --filter=name=rc_cluster --format="{{.ID}}")
2041
2207
2042 for service in $ps_cmd; do
2208 for service in $ps_cmd; do
2043
2044 servicename=`docker inspect --format '{{ .Name }}' $service`
2209 servicename=`docker inspect --format '{{ .Name }}' $service`
2045 servicename=${servicename:1}
2210 servicename=${servicename:1}
2046 printf "CONTAINER:\\t$servicename\n"
2211 printf "CONTAINER:\\t$servicename\n"
2047 printf "LOGS:\\t\\tdocker logs --tail=100 $service\n"
2212 printf "LOGS:\\t\\tdocker logs --tail=100 $service\n"
2048 docker ps --filter=name=$servicename --format="ID:\\t\\t{{.ID}}\nIMAGE:\\t\\t{{.Image}}\nSTATUS:\\t\\t{{.Status}}\nPORTS:\\t\\t{{.Ports}}\n"
2213 docker ps --filter=name=$servicename --format="ID:\\t\\t{{.ID}}\nIMAGE:\\t\\t{{.Image}}\nSTATUS:\\t\\t{{.Status}}\nPORTS:\\t\\t{{.Ports}}\n"
2049 echo ""
2214 echo ""
2050
2051 done
2215 done
2216 else
2217 docker ps --filter=name=rc_cluster --format "table {{.ID}}\t{{.Names}}\t{{.Image}}\t{{.Status}}\t{{.Ports}}" | (read -r; printf "%s\n" "$REPLY"; sort -k 2 )
2052 fi
2218 fi
2053
2219
2054 }
2220 }
2055
2221
2056 # :command.function
2222 # :command.function
2057 rccontrol_stack_upgrade_command() {
2223 rccontrol_stack_upgrade_router_command() {
2058 # src/stack_upgrade_command.sh
2224 # src/stack_upgrade_router_command.sh
2059 check_bootstrap
2225 echo "To upgrade this stack run this:"
2226 echo "./rccontrol stack router up --force-recreate --build --detach"
2227 echo ""
2228 echo "To reclaim old image space run: docker image prune -f"
2229
2230 }
2231
2232 # :command.function
2233 rccontrol_stack_upgrade_metrics_command() {
2234 # src/stack_upgrade_metrics_command.sh
2235 echo "To upgrade this stack run this:"
2236 echo "./rccontrol stack metrics up --force-recreate --build --detach"
2237 echo ""
2238 echo "To reclaim old image space run: docker image prune -f"
2239
2240 }
2060
2241
2061 echo "To upgrade particular stack run this:"
2242 # :command.function
2062 echo "./rccontrol stack STACK_NAME up --force-recreate --build --detach"
2243 rccontrol_stack_upgrade_services_command() {
2244 # src/stack_upgrade_services_command.sh
2245 echo "To upgrade this stack run this:"
2246 echo "./rccontrol stack services up --force-recreate --build --detach"
2063 echo ""
2247 echo ""
2064 echo "To reclaim old image space run: docker image prune -f"
2248 echo "To reclaim old image space run: docker image prune -f"
2249
2250 }
2251
2252 # :command.function
2253 rccontrol_stack_upgrade_rhodecode_command() {
2254 # src/stack_upgrade_rhodecode_command.sh
2255 check_bootstrap
2256
2257 stop_wait=${args[--stop-wait]}
2258 docker_stop_wait=3600
2259
2260 # search docker IDs for current service
2261 .env --file $RUNTIME_ENV
2262
2263 .env get RC_VERSION
2264 RC_VERSION=$REPLY
2265
2266 .env get RC_EDITION
2267 RC_EDITION=$REPLY
2268
2269 echo "Pulling new image: rhodecode/rhodecode-ee:${RC_VERSION}"
2270 #eval "docker pull rhodecode/rhodecode-ee:${RC_VERSION}"
2271
2272 stop_containers() {
2273 target_container=$1
2274 docker_stop_wait=$2
2275 stop_wait=$3
2276 target_containers_pat="rc_cluster_apps-$target_container-*"
2277
2278 local docker_ids=$(docker ps --filter name="$target_containers_pat" -q)
2279
2280 scale=$(echo $docker_ids | wc -w)
2281 scale_2=$(($scale*2))
2282
2283 echo ""
2284 echo "Found $scale services for $target_container"
2285 echo "docker-ids: $docker_ids"
2286 echo ""
2287
2288 echo "Scaling to $scale_2 containers for $target_container"
2289 ./rccontrol stack rhodecode up $target_container --no-recreate --detach --scale $target_container=$scale_2
2290
2291 echo ""
2292 echo "Now running $scale_2 services for upgrade..."
2293 echo ""
2294 echo "Stopping old $target_container containers..."
2295
2296 spin='⣾⣽⣻Ⓙ⑿⣟⣯⣷'
2297 spin='⠾⠽⠻⠟⠯⠷'
2298 charwidth=1
2299
2300 for container in $docker_ids
2301 do
2302
2303 local i=$(($stop_wait * 10))
2304
2305 tput civis # cursor invisible
2306 while true
2307 s=$((i / 10))
2308 do
2309 i=$(($i-1))
2310 if [[ $i -lt 1 ]]; then
2311 break
2312 fi
2313
2314 k=$(((k + $charwidth) % ${#spin}))
2315 printf "%s stopping container in $s seconds..." "${spin:$k:$charwidth}"
2316 printf "\r"
2317 sleep .1
2318 done
2319 tput cnorm
2320
2321 echo "now running container $container stop with --time $docker_stop_wait"
2322 docker stop --time $docker_stop_wait $container
2323 echo "Stopped $container"
2324 done
2325
2326 }
2327
2328 # RHODECODE
2329 stop_containers "rhodecode" $docker_stop_wait $stop_wait
2330
2331 # VCSSERVER
2332 stop_containers "vcsserver" $docker_stop_wait $stop_wait
2333
2334 # SVN
2335 stop_containers "svn" $docker_stop_wait $stop_wait
2336
2337 ./rccontrol stack rhodecode up sshd --force-recreate --build --detach
2338 ./rccontrol stack rhodecode up celery --force-recreate --build --detach
2339 ./rccontrol stack rhodecode up celery-beat --force-recreate --build --detach
2340
2341 echo "Upgrade completed"
2342 exit
2343
2065 }
2344 }
2066
2345
2067 # :command.function
2346 # :command.function
@@ -2320,8 +2599,8 b' parse_requirements() {'
2320
2599
2321 # :command.environment_variables_filter
2600 # :command.environment_variables_filter
2322 # :command.environment_variables_default
2601 # :command.environment_variables_default
2602 export RC_CLI_VERSION_NAME="${RC_CLI_VERSION_NAME:-4.28.0.REL.2022.12.20.2}"
2323 export RCC_CONFIG="${RCC_CONFIG:-.rccontrol.ini}"
2603 export RCC_CONFIG="${RCC_CONFIG:-.rccontrol.ini}"
2324 export RC_CLI_VERSION_NAME="${RC_CLI_VERSION_NAME:-4.27.0}"
2325 export RC_STACK_ROUTER_EXT="${RC_STACK_ROUTER_EXT:-.custom/docker-compose-router.override.yaml}"
2604 export RC_STACK_ROUTER_EXT="${RC_STACK_ROUTER_EXT:-.custom/docker-compose-router.override.yaml}"
2326 export RC_STACK_METRICS_EXT="${RC_STACK_METRICS_EXT:-.custom/docker-compose-metrics.override.yaml}"
2605 export RC_STACK_METRICS_EXT="${RC_STACK_METRICS_EXT:-.custom/docker-compose-metrics.override.yaml}"
2327 export RC_STACK_SERVICES_EXT="${RC_STACK_SERVICES_EXT:-.custom/docker-compose-services.override.yaml}"
2606 export RC_STACK_SERVICES_EXT="${RC_STACK_SERVICES_EXT:-.custom/docker-compose-services.override.yaml}"
@@ -3361,10 +3640,10 b' rccontrol_stack_status_parse_requirements() {'
3361 key="$1"
3640 key="$1"
3362 case "$key" in
3641 case "$key" in
3363 # :flag.case
3642 # :flag.case
3364 --simple | -s)
3643 --detailed)
3365
3644
3366 # :flag.case_no_arg
3645 # :flag.case_no_arg
3367 args[--simple]=1
3646 args[--detailed]=1
3368 shift
3647 shift
3369 ;;
3648 ;;
3370
3649
@@ -3405,7 +3684,183 b' rccontrol_stack_upgrade_parse_requirements() {'
3405 done
3684 done
3406
3685
3407 # :command.command_filter
3686 # :command.command_filter
3408 action="stack-upgrade"
3687 action=${1:-}
3688
3689 case $action in
3690 -*) ;;
3691
3692 router)
3693 action="router"
3694 shift
3695 rccontrol_stack_upgrade_router_parse_requirements "$@"
3696 shift $#
3697 ;;
3698
3699 metrics)
3700 action="metrics"
3701 shift
3702 rccontrol_stack_upgrade_metrics_parse_requirements "$@"
3703 shift $#
3704 ;;
3705
3706 services)
3707 action="services"
3708 shift
3709 rccontrol_stack_upgrade_services_parse_requirements "$@"
3710 shift $#
3711 ;;
3712
3713 rhodecode)
3714 action="rhodecode"
3715 shift
3716 rccontrol_stack_upgrade_rhodecode_parse_requirements "$@"
3717 shift $#
3718 ;;
3719
3720 # :command.command_fallback
3721 "")
3722 rccontrol_stack_upgrade_usage >&2
3723 exit 1
3724 ;;
3725
3726 *)
3727 printf "invalid command: %s\n" "$action" >&2
3728 exit 1
3729 ;;
3730
3731 esac
3732
3733 # :command.parse_requirements_while
3734 while [[ $# -gt 0 ]]; do
3735 key="$1"
3736 case "$key" in
3737
3738 -?*)
3739 printf "invalid option: %s\n" "$key" >&2
3740 exit 1
3741 ;;
3742
3743 *)
3744 # :command.parse_requirements_case
3745 # :command.parse_requirements_case_simple
3746 printf "invalid argument: %s\n" "$key" >&2
3747 exit 1
3748
3749 ;;
3750
3751 esac
3752 done
3753
3754 }
3755
3756 # :command.parse_requirements
3757 rccontrol_stack_upgrade_router_parse_requirements() {
3758 # :command.fixed_flags_filter
3759 while [[ $# -gt 0 ]]; do
3760 case "${1:-}" in
3761 --help | -h)
3762 long_usage=yes
3763 rccontrol_stack_upgrade_router_usage
3764 exit
3765 ;;
3766
3767 *)
3768 break
3769 ;;
3770
3771 esac
3772 done
3773
3774 # :command.command_filter
3775 action="stack-upgrade router"
3776
3777 # :command.parse_requirements_while
3778 while [[ $# -gt 0 ]]; do
3779 key="$1"
3780 case "$key" in
3781
3782 -?*)
3783 printf "invalid option: %s\n" "$key" >&2
3784 exit 1
3785 ;;
3786
3787 *)
3788 # :command.parse_requirements_case
3789 # :command.parse_requirements_case_simple
3790 printf "invalid argument: %s\n" "$key" >&2
3791 exit 1
3792
3793 ;;
3794
3795 esac
3796 done
3797
3798 }
3799
3800 # :command.parse_requirements
3801 rccontrol_stack_upgrade_metrics_parse_requirements() {
3802 # :command.fixed_flags_filter
3803 while [[ $# -gt 0 ]]; do
3804 case "${1:-}" in
3805 --help | -h)
3806 long_usage=yes
3807 rccontrol_stack_upgrade_metrics_usage
3808 exit
3809 ;;
3810
3811 *)
3812 break
3813 ;;
3814
3815 esac
3816 done
3817
3818 # :command.command_filter
3819 action="stack-upgrade metrics"
3820
3821 # :command.parse_requirements_while
3822 while [[ $# -gt 0 ]]; do
3823 key="$1"
3824 case "$key" in
3825
3826 -?*)
3827 printf "invalid option: %s\n" "$key" >&2
3828 exit 1
3829 ;;
3830
3831 *)
3832 # :command.parse_requirements_case
3833 # :command.parse_requirements_case_simple
3834 printf "invalid argument: %s\n" "$key" >&2
3835 exit 1
3836
3837 ;;
3838
3839 esac
3840 done
3841
3842 }
3843
3844 # :command.parse_requirements
3845 rccontrol_stack_upgrade_services_parse_requirements() {
3846 # :command.fixed_flags_filter
3847 while [[ $# -gt 0 ]]; do
3848 case "${1:-}" in
3849 --help | -h)
3850 long_usage=yes
3851 rccontrol_stack_upgrade_services_usage
3852 exit
3853 ;;
3854
3855 *)
3856 break
3857 ;;
3858
3859 esac
3860 done
3861
3862 # :command.command_filter
3863 action="stack-upgrade services"
3409
3864
3410 # :command.parse_requirements_while
3865 # :command.parse_requirements_while
3411 while [[ $# -gt 0 ]]; do
3866 while [[ $# -gt 0 ]]; do
@@ -3431,6 +3886,67 b' rccontrol_stack_upgrade_parse_requirements() {'
3431 }
3886 }
3432
3887
3433 # :command.parse_requirements
3888 # :command.parse_requirements
3889 rccontrol_stack_upgrade_rhodecode_parse_requirements() {
3890 # :command.fixed_flags_filter
3891 while [[ $# -gt 0 ]]; do
3892 case "${1:-}" in
3893 --help | -h)
3894 long_usage=yes
3895 rccontrol_stack_upgrade_rhodecode_usage
3896 exit
3897 ;;
3898
3899 *)
3900 break
3901 ;;
3902
3903 esac
3904 done
3905
3906 # :command.command_filter
3907 action="stack-upgrade rhodecode"
3908
3909 # :command.parse_requirements_while
3910 while [[ $# -gt 0 ]]; do
3911 key="$1"
3912 case "$key" in
3913 # :flag.case
3914 --stop-wait)
3915
3916 # :flag.case_arg
3917 if [[ -n ${2+x} ]]; then
3918
3919 args[--stop-wait]="$2"
3920 shift
3921 shift
3922 else
3923 printf "%s\n" "--stop-wait requires an argument: --stop-wait STOP_WAIT" >&2
3924 exit 1
3925 fi
3926 ;;
3927
3928 -?*)
3929 printf "invalid option: %s\n" "$key" >&2
3930 exit 1
3931 ;;
3932
3933 *)
3934 # :command.parse_requirements_case
3935 # :command.parse_requirements_case_simple
3936 printf "invalid argument: %s\n" "$key" >&2
3937 exit 1
3938
3939 ;;
3940
3941 esac
3942 done
3943
3944 # :command.default_assignments
3945 [[ -n ${args[--stop-wait]:-} ]] || args[--stop-wait]="120"
3946
3947 }
3948
3949 # :command.parse_requirements
3434 rccontrol_cli_parse_requirements() {
3950 rccontrol_cli_parse_requirements() {
3435 # :command.fixed_flags_filter
3951 # :command.fixed_flags_filter
3436 while [[ $# -gt 0 ]]; do
3952 while [[ $# -gt 0 ]]; do
@@ -3896,13 +4412,13 b' rccontrol__completions_parse_requirements() {'
3896
4412
3897 # :command.initialize
4413 # :command.initialize
3898 initialize() {
4414 initialize() {
3899 version="4.28.0.rel2022.12.15.3"
4415 version="4.28.0.REL.2022.12.20.2"
3900 long_usage=''
4416 long_usage=''
3901 set -e
4417 set -e
3902
4418
3903 # :command.environment_variables_default
4419 # :command.environment_variables_default
4420 export RC_CLI_VERSION_NAME="${RC_CLI_VERSION_NAME:-4.28.0.REL.2022.12.20.2}"
3904 export RCC_CONFIG="${RCC_CONFIG:-.rccontrol.ini}"
4421 export RCC_CONFIG="${RCC_CONFIG:-.rccontrol.ini}"
3905 export RC_CLI_VERSION_NAME="${RC_CLI_VERSION_NAME:-4.27.0}"
3906 export RC_STACK_ROUTER_EXT="${RC_STACK_ROUTER_EXT:-.custom/docker-compose-router.override.yaml}"
4422 export RC_STACK_ROUTER_EXT="${RC_STACK_ROUTER_EXT:-.custom/docker-compose-router.override.yaml}"
3907 export RC_STACK_METRICS_EXT="${RC_STACK_METRICS_EXT:-.custom/docker-compose-metrics.override.yaml}"
4423 export RC_STACK_METRICS_EXT="${RC_STACK_METRICS_EXT:-.custom/docker-compose-metrics.override.yaml}"
3908 export RC_STACK_SERVICES_EXT="${RC_STACK_SERVICES_EXT:-.custom/docker-compose-services.override.yaml}"
4424 export RC_STACK_SERVICES_EXT="${RC_STACK_SERVICES_EXT:-.custom/docker-compose-services.override.yaml}"
@@ -4148,6 +4664,42 b' run() {'
4148 fi
4664 fi
4149 ;;
4665 ;;
4150
4666
4667 "stack-upgrade router")
4668 if [[ ${args[--help]:-} ]]; then
4669 long_usage=yes
4670 rccontrol_stack_upgrade_router_usage
4671 else
4672 rccontrol_stack_upgrade_router_command
4673 fi
4674 ;;
4675
4676 "stack-upgrade metrics")
4677 if [[ ${args[--help]:-} ]]; then
4678 long_usage=yes
4679 rccontrol_stack_upgrade_metrics_usage
4680 else
4681 rccontrol_stack_upgrade_metrics_command
4682 fi
4683 ;;
4684
4685 "stack-upgrade services")
4686 if [[ ${args[--help]:-} ]]; then
4687 long_usage=yes
4688 rccontrol_stack_upgrade_services_usage
4689 else
4690 rccontrol_stack_upgrade_services_command
4691 fi
4692 ;;
4693
4694 "stack-upgrade rhodecode")
4695 if [[ ${args[--help]:-} ]]; then
4696 long_usage=yes
4697 rccontrol_stack_upgrade_rhodecode_usage
4698 else
4699 rccontrol_stack_upgrade_rhodecode_command
4700 fi
4701 ;;
4702
4151 "cli")
4703 "cli")
4152 if [[ ${args[--help]:-} ]]; then
4704 if [[ ${args[--help]:-} ]]; then
4153 long_usage=yes
4705 long_usage=yes
General Comments 0
You need to be logged in to leave comments. Login now