Show More
@@ -1275,6 +1275,8 b' get_docker_definitions() {' | |||||
1275 |
|
1275 | |||
1276 | echo "$(green bootstrap_definitions: docker definitions extracted to $SOURCE_DIR)" |
|
1276 | echo "$(green bootstrap_definitions: docker definitions extracted to $SOURCE_DIR)" | |
1277 |
|
1277 | |||
|
1278 | # cleanup | |||
|
1279 | ||||
1278 | } |
|
1280 | } | |
1279 |
|
1281 | |||
1280 | # src/lib/send_completions.sh |
|
1282 | # src/lib/send_completions.sh | |
@@ -1450,16 +1452,23 b' rccontrol_self_update_command() {' | |||||
1450 | FETCH_FROM=$SERVER_URL/rhodecode-enterprise-docker/raw/master/scripts/rccontrol/rccontrol |
|
1452 | FETCH_FROM=$SERVER_URL/rhodecode-enterprise-docker/raw/master/scripts/rccontrol/rccontrol | |
1451 | TARGET=$PWD/scripts/rccontrol/rccontrol |
|
1453 | TARGET=$PWD/scripts/rccontrol/rccontrol | |
1452 |
|
1454 | |||
|
1455 | version_old=$($TARGET --version) | |||
|
1456 | ||||
1453 | echo "$(green self-update: downloading new rccontrol script from $FETCH_FROM)" |
|
1457 | echo "$(green self-update: downloading new rccontrol script from $FETCH_FROM)" | |
1454 | curl --header "X-Rc-Auth-Token: $AUTH_TOKEN" -o $TARGET -L $FETCH_FROM |
|
1458 | curl --fail --header "X-Rc-Auth-Token: $AUTH_TOKEN" -o $TARGET -L $FETCH_FROM | |
1455 | chmod +x $TARGET |
|
1459 | chmod +x $TARGET | |
1456 |
|
1460 | |||
1457 | echo "$(green self-update: done ! File saved in $TARGET)" |
|
1461 | version_dl=$($TARGET --version) | |
|
1462 | echo "self-update: version downloaded: $version_dl" | |||
1458 |
|
1463 | |||
1459 | get_docker_definitions $revision |
|
1464 | if [[ $version_old == $version_dl ]]; then | |
|
1465 | echo "$(yellow self-update: no new version available, latest seems to be $version_dl)" | |||
|
1466 | exit | |||
|
1467 | else | |||
|
1468 | echo "$(green self-update: update to new version: $version_dl)" | |||
|
1469 | fi | |||
1460 |
|
1470 | |||
1461 | echo "$(green self-update: done ! new version info:)" |
|
1471 | get_docker_definitions $revision | |
1462 | ./rccontrol --version |
|
|||
1463 |
|
1472 | |||
1464 | exit |
|
1473 | exit | |
1465 | } |
|
1474 | } | |
@@ -1565,7 +1574,7 b' rccontrol_bootstrap_command() {' | |||||
1565 | .env set +RC_SQLALCHEMY_DB1_URL="postgresql://$DB_USER:$db_key@database/$DB_NAME" |
|
1574 | .env set +RC_SQLALCHEMY_DB1_URL="postgresql://$DB_USER:$db_key@database/$DB_NAME" | |
1566 |
|
1575 | |||
1567 | .env set +RC_LICENSE_TOKEN=$license_token |
|
1576 | .env set +RC_LICENSE_TOKEN=$license_token | |
1568 | .env set +RC_BASE_URL=$base_url |
|
1577 | .env set +RC_APP_BASE_URL=$base_url | |
1569 |
|
1578 | |||
1570 | .env puts '# Log formatter option' |
|
1579 | .env puts '# Log formatter option' | |
1571 | .env set +RC_LOG_FORMATTER=$log_formatter |
|
1580 | .env set +RC_LOG_FORMATTER=$log_formatter | |
@@ -1573,9 +1582,13 b' rccontrol_bootstrap_command() {' | |||||
1573 |
|
1582 | |||
1574 | .env puts '# Channelstream config' |
|
1583 | .env puts '# Channelstream config' | |
1575 | .env set +RC_CHANNELSTREAM_WS_URL=ws:/docker-dev/_channelstream |
|
1584 | .env set +RC_CHANNELSTREAM_WS_URL=ws:/docker-dev/_channelstream | |
|
1585 | .env set +CHANNELSTREAM_ALLOW_POSTING_FROM=0.0.0.0 | |||
|
1586 | ||||
1576 | .env set +CHANNELSTREAM_SECRET=$shared_key |
|
1587 | .env set +CHANNELSTREAM_SECRET=$shared_key | |
|
1588 | .env set +RC_CHANNELSTREAM_SECRET=$shared_key | |||
|
1589 | ||||
1577 | .env set +CHANNELSTREAM_ADMIN_SECRET=$shared_key |
|
1590 | .env set +CHANNELSTREAM_ADMIN_SECRET=$shared_key | |
1578 |
.env set +CHANNELSTREAM_A |
|
1591 | .env set +RC_CHANNELSTREAM_ADMIN_SECRET=$shared_key | |
1579 |
|
1592 | |||
1580 | else |
|
1593 | else | |
1581 | echo "bootstrap_config: $BOOTSTRAP_RUNTIME_ENV file exists, not adding any configuration..." |
|
1594 | echo "bootstrap_config: $BOOTSTRAP_RUNTIME_ENV file exists, not adding any configuration..." | |
@@ -2155,6 +2168,10 b' rccontrol_cli_storage_command() {' | |||||
2155 | # echo "---" |
|
2168 | # echo "---" | |
2156 | #fi |
|
2169 | #fi | |
2157 |
|
2170 | |||
|
2171 | echo "attaching $PWD/.custom/storage under /vol/backupvolume" | |||
|
2172 | echo "attaching rc_datavolume under /vol/datavolume " | |||
|
2173 | echo "attaching rc_reposvolume under /vol/repovolume" | |||
|
2174 | ||||
2158 | docker run --rm \ |
|
2175 | docker run --rm \ | |
2159 | -it \ |
|
2176 | -it \ | |
2160 | --volume $PWD/.custom/storage:/vol/backupvolume \ |
|
2177 | --volume $PWD/.custom/storage:/vol/backupvolume \ | |
@@ -3793,7 +3810,7 b' rccontrol__completions_parse_requirements() {' | |||||
3793 |
|
3810 | |||
3794 | # :command.initialize |
|
3811 | # :command.initialize | |
3795 | initialize() { |
|
3812 | initialize() { | |
3796 |
version="4.28.0.rel2022.12.13. |
|
3813 | version="4.28.0.rel2022.12.13.2" | |
3797 | long_usage='' |
|
3814 | long_usage='' | |
3798 | set -e |
|
3815 | set -e | |
3799 |
|
3816 |
@@ -24,4 +24,6 b' RHODECODE_USER_EMAIL=admin@server-com' | |||||
24 | RHODECODE_USER_NAME=admin |
|
24 | RHODECODE_USER_NAME=admin | |
25 | RHODECODE_USER_PASS=secret4 |
|
25 | RHODECODE_USER_PASS=secret4 | |
26 |
|
26 | |||
27 | RC_USE_CELERY=true No newline at end of file |
|
27 | RC_USE_CELERY=true | |
|
28 | ||||
|
29 | RC_APP_BASE_URL=base-url No newline at end of file |
General Comments 0
You need to be logged in to leave comments.
Login now