From 5a56d4cf5049b0cbf894e85c17b7f07c424a90a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com> Date: Thu, 4 Jul 2024 11:45:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release-drafter.yml | 37 +- cn-quick_start.sh | 1 - jmsctl.sh | 1 + locale/en/LC_MESSAGES/jumpserver-installer.po | 486 ++++++++-------- .../zh_CN/LC_MESSAGES/jumpserver-installer.mo | Bin 13834 -> 14156 bytes .../zh_CN/LC_MESSAGES/jumpserver-installer.po | 535 +++++++++--------- .../LC_MESSAGES/jumpserver-installer.mo | Bin 13227 -> 14108 bytes .../LC_MESSAGES/jumpserver-installer.po | 533 ++++++++--------- quick_start.sh | 1 - scripts/7_upgrade.sh | 32 +- scripts/utils.sh | 122 ++-- 11 files changed, 904 insertions(+), 844 deletions(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 296b7ca0..0c0047ac 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -7,40 +7,41 @@ on: name: Create Release And Upload assets jobs: - create-realese: + create-release: # 修正了拼写错误 name: Create Release runs-on: ubuntu-latest outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 + - name: Get version id: get_version run: | TAG=$(basename ${GITHUB_REF}) - VERSION=${TAG/v/} - echo "::set-output name=TAG::$TAG" - echo "::set-output name=VERSION::$VERSION" + echo "TAG=$TAG" >> $GITHUB_OUTPUT + - name: Create Release id: create_release - uses: release-drafter/release-drafter@v5 + uses: release-drafter/release-drafter@v6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: config-name: release-config.yml version: ${{ steps.get_version.outputs.TAG }} tag: ${{ steps.get_version.outputs.TAG }} - - build-and-release: - needs: create-realese - name: Build and Release - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Build it and upload - uses: jumpserver/action-build-upload-assets@master + + - name: Create Upload Assets + run: | + mkdir -p build jumpserver-installer-${{ steps.get_version.outputs.TAG }} + git archive --format tar HEAD | tar x -C jumpserver-installer-${{ steps.get_version.outputs.TAG }} + tar -czf build/jumpserver-installer-${{ steps.get_version.outputs.TAG }}.tar.gz jumpserver-installer-${{ steps.get_version.outputs.TAG }} + cd build + md5sum jumpserver-installer-${{ steps.get_version.outputs.TAG }}.tar.gz > jumpserver-installer-${{ steps.get_version.outputs.TAG }}.tar.gz.md5 + + - name: Release Upload Assets + run: | + gh release upload ${{ steps.get_version.outputs.TAG }} build/* -R $GITHUB_REPOSITORY env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.create-realese.outputs.upload_url }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/cn-quick_start.sh b/cn-quick_start.sh index c3542458..ace0470b 100644 --- a/cn-quick_start.sh +++ b/cn-quick_start.sh @@ -50,7 +50,6 @@ function get_installer() { function config_installer() { cd /opt/jumpserver-installer-${VERSION} || exit 1 - sed -i "s/VERSION=.*/VERSION=${VERSION}/g" /opt/jumpserver-installer-${VERSION}/static.env sed -i "s/# DOCKER_IMAGE_MIRROR=1/DOCKER_IMAGE_MIRROR=1/g" /opt/jumpserver-installer-${VERSION}/config-example.txt ./jmsctl.sh install ./jmsctl.sh start diff --git a/jmsctl.sh b/jmsctl.sh index a9d6df9c..d3c15a2a 100755 --- a/jmsctl.sh +++ b/jmsctl.sh @@ -45,6 +45,7 @@ function usage() { echo echo "Installation Commands: " echo " install $(gettext 'Install JumpServer')" + echo " upgrade $(gettext 'Upgrade JumpServer')" echo echo "Management Commands: " echo " config $(gettext 'Configuration Tools')" diff --git a/locale/en/LC_MESSAGES/jumpserver-installer.po b/locale/en/LC_MESSAGES/jumpserver-installer.po index c46f8c03..79087163 100644 --- a/locale/en/LC_MESSAGES/jumpserver-installer.po +++ b/locale/en/LC_MESSAGES/jumpserver-installer.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-29 17:11+0800\n" +"POT-Creation-Date: 2024-07-04 19:12+0800\n" "PO-Revision-Date: 2021-01-21 19:15+0800\n" "Last-Translator: Bai \n" "Language-Team: Language locale/en/LC\n" @@ -16,48 +16,82 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: scripts/0_prepare.sh:14 -msgid "Starting to download Docker engine" +#: scripts/2_install_docker.sh:25 +msgid "Docker program does not exist" msgstr "" -#: scripts/0_prepare.sh:16 -msgid "Download docker fails, check the network is normal" +#: scripts/2_install_docker.sh:78 scripts/2_install_docker.sh:171 +msgid "Permission denied. pass..." msgstr "" -#: scripts/0_prepare.sh:21 -msgid "Using Docker cache" +#: scripts/2_install_docker.sh:153 +msgid "Do you want to support IPv6" msgstr "" -#: scripts/0_prepare.sh:36 -msgid "Starting to download Docker Compose binary" +#: scripts/2_install_docker.sh:203 +msgid "Install Docker" msgstr "" -#: scripts/0_prepare.sh:38 -msgid "Download docker-compose fails, check the network is normal" +#: scripts/2_install_docker.sh:206 +msgid "Configure Docker" msgstr "" -#: scripts/0_prepare.sh:43 -msgid "Using Docker Compose cache" +#: scripts/2_install_docker.sh:208 +msgid "Start Docker" msgstr "" -#: scripts/0_prepare.sh:55 scripts/7_upgrade.sh:24 -msgid "Docker is not running, please install and start" +#: scripts/utils.sh:215 +msgid "no default" msgstr "" -#: scripts/0_prepare.sh:81 -msgid "The image has been saved, skipping" +#: scripts/utils.sh:217 +msgid "default" msgstr "" -#: scripts/0_prepare.sh:85 -msgid "Save image" +#: scripts/utils.sh:265 +msgid "complete" msgstr "" -#: scripts/0_prepare.sh:95 -msgid "Preparing Docker offline package" +#: scripts/utils.sh:277 +msgid "fail" msgstr "" -#: scripts/0_prepare.sh:99 -msgid "Preparing image offline package" +#: scripts/utils.sh:414 +msgid "command not found, Please install it first" +msgstr "" + +#: scripts/utils.sh:446 +msgid "Check Configuration File" +msgstr "" + +#: scripts/utils.sh:447 +msgid "Path to Configuration file" +msgstr "" + +#: scripts/utils.sh:593 scripts/1_config_jumpserver.sh:237 +#: scripts/7_upgrade.sh:210 +msgid "Failed to change the table structure" +msgstr "" + +#: scripts/utils.sh:682 +msgid "Failed to pull image" +msgstr "" + +#: scripts/5_db_backup.sh:19 +msgid "Backing up" +msgstr "" + +#: scripts/5_db_backup.sh:45 scripts/1_config_jumpserver.sh:136 +#: scripts/6_db_restore.sh:46 +msgid "Invalid DB Engine selection" +msgstr "" + +#: scripts/5_db_backup.sh:51 scripts/5_db_backup.sh:52 +msgid "Backup failed" +msgstr "" + +#: scripts/5_db_backup.sh:56 +msgid "Backup succeeded! The backup file has been saved to" msgstr "" #: scripts/1_config_jumpserver.sh:8 @@ -124,11 +158,6 @@ msgstr "" msgid "Do you want to use external PostgreSQL" msgstr "" -#: scripts/1_config_jumpserver.sh:136 scripts/6_db_restore.sh:46 -#: scripts/5_db_backup.sh:45 -msgid "Invalid DB Engine selection" -msgstr "" - #: scripts/1_config_jumpserver.sh:144 msgid "Please enter Redis server IP" msgstr "" @@ -193,140 +222,87 @@ msgstr "" msgid "Init JumpServer Database" msgstr "" -#: scripts/1_config_jumpserver.sh:237 scripts/7_upgrade.sh:185 -#: scripts/utils.sh:565 -msgid "Failed to change the table structure" -msgstr "" - -#: scripts/2_install_docker.sh:25 -msgid "Docker program does not exist" -msgstr "" - -#: scripts/2_install_docker.sh:80 scripts/2_install_docker.sh:173 -msgid "Permission denied. pass..." +#: scripts/7_upgrade.sh:19 +msgid "The current version is not detected, please check" msgstr "" -#: scripts/2_install_docker.sh:155 -msgid "Do you want to support IPv6" -msgstr "" - -#: scripts/2_install_docker.sh:205 -msgid "Install Docker" -msgstr "" - -#: scripts/2_install_docker.sh:208 -msgid "Configure Docker" -msgstr "" - -#: scripts/2_install_docker.sh:210 -msgid "Start Docker" -msgstr "" - -#: scripts/3_load_images.sh:19 -msgid "Docker image not found" -msgstr "" - -#: scripts/3_load_images.sh:36 -msgid "Docker image loaded, skipping" -msgstr "" - -#: scripts/6_db_restore.sh:15 scripts/8_uninstall.sh:70 -msgid "Make sure you have a backup of data, this operation is not reversible" -msgstr "" - -#: scripts/6_db_restore.sh:18 -msgid "file does not exist" -msgstr "" - -#: scripts/6_db_restore.sh:24 -msgid "Start restoring database" -msgstr "" - -#: scripts/6_db_restore.sh:52 +#: scripts/7_upgrade.sh:24 msgid "" -"Database recovery failed. Please check whether the database file is complete " -"or try to recover manually" +"Your current version does not meet the minimum requirements. Please upgrade " +"to" msgstr "" -#: scripts/6_db_restore.sh:55 -msgid "Database recovered successfully" -msgstr "" - -#: scripts/6_db_restore.sh:66 -msgid "Format error" -msgstr "" - -#: scripts/6_db_restore.sh:70 -msgid "The backup file does not exist" +#: scripts/7_upgrade.sh:43 scripts/0_prepare.sh:55 +msgid "Docker is not running, please install and start" msgstr "" -#: scripts/7_upgrade.sh:152 +#: scripts/7_upgrade.sh:177 msgid "Back up to" msgstr "" -#: scripts/7_upgrade.sh:159 +#: scripts/7_upgrade.sh:184 msgid "Failed to backup the database. Continue to upgrade" msgstr "" -#: scripts/7_upgrade.sh:165 +#: scripts/7_upgrade.sh:190 msgid "Skip database backup" msgstr "" -#: scripts/7_upgrade.sh:172 +#: scripts/7_upgrade.sh:197 msgid "" "Detected that the JumpServer container is running. Do you want to close the " "container and continue to upgrade" msgstr "" -#: scripts/7_upgrade.sh:187 +#: scripts/7_upgrade.sh:212 msgid "Failed to change the table structure. Continue to upgrade" msgstr "" -#: scripts/7_upgrade.sh:200 +#: scripts/7_upgrade.sh:225 msgid "Do you need to clean up the old version image" msgstr "" -#: scripts/7_upgrade.sh:213 +#: scripts/7_upgrade.sh:238 msgid "Do you need upgrade Docker binaries" msgstr "" -#: scripts/7_upgrade.sh:236 +#: scripts/7_upgrade.sh:261 msgid "Do you need upgrade Docker Compose" msgstr "" -#: scripts/7_upgrade.sh:254 +#: scripts/7_upgrade.sh:279 msgid "Are you sure you want to update the current version to" msgstr "" -#: scripts/7_upgrade.sh:266 scripts/4_install_jumpserver.sh:75 +#: scripts/7_upgrade.sh:294 scripts/4_install_jumpserver.sh:75 msgid "Loading Docker Image" msgstr "" -#: scripts/7_upgrade.sh:269 jmsctl.sh:60 +#: scripts/7_upgrade.sh:297 jmsctl.sh:61 msgid "Backup database" msgstr "" -#: scripts/7_upgrade.sh:272 +#: scripts/7_upgrade.sh:300 msgid "Backup Configuration File" msgstr "" -#: scripts/7_upgrade.sh:275 +#: scripts/7_upgrade.sh:303 msgid "Apply database changes" msgstr "" -#: scripts/7_upgrade.sh:276 +#: scripts/7_upgrade.sh:304 msgid "Changing database schema may take a while, please wait patiently" msgstr "" -#: scripts/7_upgrade.sh:279 +#: scripts/7_upgrade.sh:307 msgid "Cleanup Image" msgstr "" -#: scripts/7_upgrade.sh:282 +#: scripts/7_upgrade.sh:310 msgid "Upgrade Docker" msgstr "" -#: scripts/7_upgrade.sh:288 +#: scripts/7_upgrade.sh:316 msgid "Upgrade successfully. You can now restart the program" msgstr "" @@ -345,6 +321,10 @@ msgstr "" msgid "Do you need to clean up the Docker Compose binaries" msgstr "" +#: scripts/8_uninstall.sh:70 scripts/6_db_restore.sh:15 +msgid "Make sure you have a backup of data, this operation is not reversible" +msgstr "" + #: scripts/8_uninstall.sh:74 msgid "Are you clean up JumpServer files" msgstr "" @@ -357,10 +337,148 @@ msgstr "" msgid "Cleanup complete" msgstr "" -#: scripts/8_uninstall.sh:99 jmsctl.sh:56 +#: scripts/8_uninstall.sh:99 jmsctl.sh:57 msgid "Uninstall JumpServer" msgstr "" +#: scripts/0_prepare.sh:14 +msgid "Starting to download Docker engine" +msgstr "" + +#: scripts/0_prepare.sh:16 +msgid "Download docker fails, check the network is normal" +msgstr "" + +#: scripts/0_prepare.sh:21 +msgid "Using Docker cache" +msgstr "" + +#: scripts/0_prepare.sh:36 +msgid "Starting to download Docker Compose binary" +msgstr "" + +#: scripts/0_prepare.sh:38 +msgid "Download docker-compose fails, check the network is normal" +msgstr "" + +#: scripts/0_prepare.sh:43 +msgid "Using Docker Compose cache" +msgstr "" + +#: scripts/0_prepare.sh:81 +msgid "The image has been saved, skipping" +msgstr "" + +#: scripts/0_prepare.sh:85 +msgid "Save image" +msgstr "" + +#: scripts/0_prepare.sh:95 +msgid "Preparing Docker offline package" +msgstr "" + +#: scripts/0_prepare.sh:99 +msgid "Preparing image offline package" +msgstr "" + +#: scripts/3_load_images.sh:19 +msgid "Docker image not found" +msgstr "" + +#: scripts/3_load_images.sh:36 +msgid "Docker image loaded, skipping" +msgstr "" + +#: scripts/4_install_jumpserver.sh:10 +msgid "" +"The current Linux system does not support systemd management. Please deploy " +"docker by yourself before running this script again" +msgstr "" + +#: scripts/4_install_jumpserver.sh:14 +msgid "" +"The current Linux system does not support systemd management. Please deploy " +"docker-compose by yourself before running this script again" +msgstr "" + +#: scripts/4_install_jumpserver.sh:21 +msgid "The Installation is Complete" +msgstr "" + +#: scripts/4_install_jumpserver.sh:32 +msgid "You can use the following command to start, and then visit" +msgstr "" + +#: scripts/4_install_jumpserver.sh:36 +msgid "Other management commands" +msgstr "" + +#: scripts/4_install_jumpserver.sh:41 +msgid "For more commands, you can enter ./jmsctl.sh --help to understand" +msgstr "" + +#: scripts/4_install_jumpserver.sh:43 +msgid "Web access" +msgstr "" + +#: scripts/4_install_jumpserver.sh:50 +msgid "Default username" +msgstr "" + +#: scripts/4_install_jumpserver.sh:50 +msgid "Default password" +msgstr "" + +#: scripts/4_install_jumpserver.sh:53 +msgid "access" +msgstr "" + +#: scripts/4_install_jumpserver.sh:58 +msgid "More information" +msgstr "" + +#: scripts/4_install_jumpserver.sh:59 +msgid "Official Website" +msgstr "" + +#: scripts/4_install_jumpserver.sh:60 +msgid "Documentation" +msgstr "" + +#: scripts/4_install_jumpserver.sh:70 +msgid "Install and Configure Docker" +msgstr "" + +#: scripts/4_install_jumpserver.sh:79 +msgid "Install and Configure JumpServer" +msgstr "" + +#: scripts/6_db_restore.sh:18 +msgid "file does not exist" +msgstr "" + +#: scripts/6_db_restore.sh:24 +msgid "Start restoring database" +msgstr "" + +#: scripts/6_db_restore.sh:52 +msgid "" +"Database recovery failed. Please check whether the database file is complete " +"or try to recover manually" +msgstr "" + +#: scripts/6_db_restore.sh:55 +msgid "Database recovered successfully" +msgstr "" + +#: scripts/6_db_restore.sh:66 +msgid "Format error" +msgstr "" + +#: scripts/6_db_restore.sh:70 +msgid "The backup file does not exist" +msgstr "" + #: scripts/config.sh:16 msgid "Configuration ntp sync" msgstr "" @@ -401,27 +519,27 @@ msgstr "" msgid "Please enter HTTPS PORT" msgstr "" -#: scripts/config.sh:72 +#: scripts/config.sh:73 msgid "Please enter SSH PORT" msgstr "" -#: scripts/config.sh:77 +#: scripts/config.sh:78 msgid "Please enter MAGNUS MYSQL PORT" msgstr "" -#: scripts/config.sh:80 +#: scripts/config.sh:81 msgid "Please enter MAGNUS MARIADB PORT" msgstr "" -#: scripts/config.sh:83 +#: scripts/config.sh:84 msgid "Please enter MAGNUS REDIS PORT" msgstr "" -#: scripts/config.sh:86 +#: scripts/config.sh:87 msgid "Please enter MAGNUS POSTGRESQL PORT" msgstr "" -#: scripts/config.sh:89 +#: scripts/config.sh:90 msgid "Please enter MAGNUS SQLSERVER PORT" msgstr "" @@ -485,114 +603,6 @@ msgstr "" msgid "Configuration file not found" msgstr "" -#: scripts/utils.sh:198 -msgid "no default" -msgstr "" - -#: scripts/utils.sh:200 -msgid "default" -msgstr "" - -#: scripts/utils.sh:248 -msgid "complete" -msgstr "" - -#: scripts/utils.sh:260 -msgid "fail" -msgstr "" - -#: scripts/utils.sh:385 -msgid "command not found, Please install it first" -msgstr "" - -#: scripts/utils.sh:417 -msgid "Check Configuration File" -msgstr "" - -#: scripts/utils.sh:418 -msgid "Path to Configuration file" -msgstr "" - -#: scripts/utils.sh:634 -msgid "Failed to pull image" -msgstr "" - -#: scripts/4_install_jumpserver.sh:10 -msgid "" -"The current Linux system does not support systemd management. Please deploy " -"docker by yourself before running this script again" -msgstr "" - -#: scripts/4_install_jumpserver.sh:14 -msgid "" -"The current Linux system does not support systemd management. Please deploy " -"docker-compose by yourself before running this script again" -msgstr "" - -#: scripts/4_install_jumpserver.sh:21 -msgid "The Installation is Complete" -msgstr "" - -#: scripts/4_install_jumpserver.sh:32 -msgid "You can use the following command to start, and then visit" -msgstr "" - -#: scripts/4_install_jumpserver.sh:36 -msgid "Other management commands" -msgstr "" - -#: scripts/4_install_jumpserver.sh:41 -msgid "For more commands, you can enter ./jmsctl.sh --help to understand" -msgstr "" - -#: scripts/4_install_jumpserver.sh:43 -msgid "Web access" -msgstr "" - -#: scripts/4_install_jumpserver.sh:50 -msgid "Default username" -msgstr "" - -#: scripts/4_install_jumpserver.sh:50 -msgid "Default password" -msgstr "" - -#: scripts/4_install_jumpserver.sh:53 -msgid "access" -msgstr "" - -#: scripts/4_install_jumpserver.sh:58 -msgid "More information" -msgstr "" - -#: scripts/4_install_jumpserver.sh:59 -msgid "Official Website" -msgstr "" - -#: scripts/4_install_jumpserver.sh:60 -msgid "Documentation" -msgstr "" - -#: scripts/4_install_jumpserver.sh:70 -msgid "Install and Configure Docker" -msgstr "" - -#: scripts/4_install_jumpserver.sh:79 -msgid "Install and Configure JumpServer" -msgstr "" - -#: scripts/5_db_backup.sh:19 -msgid "Backing up" -msgstr "" - -#: scripts/5_db_backup.sh:51 scripts/5_db_backup.sh:52 -msgid "Backup failed" -msgstr "" - -#: scripts/5_db_backup.sh:56 -msgid "Backup succeeded! The backup file has been saved to" -msgstr "" - #: jmsctl.sh:16 msgid "If you are upgrading from v1.5.x, please copy the config.txt To" msgstr "" @@ -609,66 +619,70 @@ msgstr "" msgid "Install JumpServer" msgstr "" -#: jmsctl.sh:50 -msgid "Configuration Tools" +#: jmsctl.sh:48 +msgid "Upgrade JumpServer" msgstr "" #: jmsctl.sh:51 -msgid "Start JumpServer" +msgid "Configuration Tools" msgstr "" #: jmsctl.sh:52 -msgid "Stop JumpServer" +msgid "Start JumpServer" msgstr "" #: jmsctl.sh:53 -msgid "Restart JumpServer" +msgid "Stop JumpServer" msgstr "" #: jmsctl.sh:54 -msgid "Check JumpServer" +msgid "Restart JumpServer" msgstr "" #: jmsctl.sh:55 +msgid "Check JumpServer" +msgstr "" + +#: jmsctl.sh:56 msgid "Offline JumpServer" msgstr "" -#: jmsctl.sh:59 +#: jmsctl.sh:60 msgid "Loading docker image" msgstr "" -#: jmsctl.sh:61 +#: jmsctl.sh:62 msgid "Data recovery through database backup file" msgstr "" -#: jmsctl.sh:62 +#: jmsctl.sh:63 msgid "Execute the original docker compose command" msgstr "" -#: jmsctl.sh:63 +#: jmsctl.sh:64 msgid "View log" msgstr "" -#: jmsctl.sh:118 +#: jmsctl.sh:119 msgid "The current version is up to date" msgstr "" -#: jmsctl.sh:123 +#: jmsctl.sh:124 msgid "The latest version is" msgstr "" -#: jmsctl.sh:127 +#: jmsctl.sh:128 msgid "The current version is" msgstr "" -#: jmsctl.sh:172 jmsctl.sh:178 +#: jmsctl.sh:173 jmsctl.sh:179 msgid "Unsupported Operating System Error" msgstr "" -#: jmsctl.sh:173 +#: jmsctl.sh:174 msgid "macOS installer please see" msgstr "" -#: jmsctl.sh:179 +#: jmsctl.sh:180 msgid "Windows installer please see" msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/jumpserver-installer.mo b/locale/zh_CN/LC_MESSAGES/jumpserver-installer.mo index 59fcfb4d7376975eca68e82984c9af548a25b209..50a9301cce4b5eced6acb2cdc05c3c196c561c2d 100644 GIT binary patch delta 3229 zcmX}tc~F&A7{~E*Cp83ah=it~ye=(*5(sLjr731PnhQ>)WJ>TRE|=x96is#2Y6KCt z3ofXcsZ@@RrMaXz(Nt!mLpJ`AHfS|@FZNGro73L+$34>>&ii@KdEay1=RD`UFRPZG zEeTxi*`>+w+f7NPjO}X7H~3^U2Ywg4#`MCAH~_EXNbGr=F}mdu>ul^peLluv4RWig z!z|o{cj6hm2XEkbV*;ixci&D!KHh<47=v}F0h+J}?n2%79xBk!aWIBa0mg7sUmS>u zct6Hs9`a`va8Q8d*dOaLk>{JeoG^xI#Z)|pDflNY#H9Gh054k`(MS6poQMfMBQty) z)2P>@W_T2b;kP&fZ%ZIJ%*8>t5VLu{skaweF^T&3n2!IVQl8GV@4^|V`m@*%x1eTz z6z|10+x`zKbIGJ(IHuxgoQDc#-o-d4;?H+O=vwT<@@n&Jd4cD{L-8J>m-U%Wil#&4C^GEM13x@8s>GJ zh40#W7Zz0aC!*Fim4o&`u5~^tpyyEmZ$i47!^od$>qGt(;Z=K~3%!|~>4yYqveCh* zs2TWdeKl$g_uKX_QEPi0)h~fTWg6;16H!Yy50&u%@@IDIL=m>49&ia2;a|wAm_#mW zZPPFd^HBk=#Ua>&TGMmr;9scC+mGogGxwwFvrqy1QLpVrdp)qzo*Y4~^%+zE7f^4* z4b;q%iB1EKL!Mz~qXI7HKoZS5T!}q+ngZO6nRoy-^Y2h^#Vt-`yrHQ5XQp$al(?wZ zX%)VRZKwxMrMChoKy9{HP@64?Bd`U@x@ouVH!+HOG@Ufl1XRHNaWsy>N3j~aDfCY{ z(M->xI^M)vQTgfuQK-%7MLlQ$YT&V`8BWHj9=>>}B|F7zG@*75%A|+SUU%$^%J5*+ z1Try>=bK!6VK(YLFF>t%E$Rbu4DZ7*^35?R+|)S$YQS9UOzTtDC8z+NL-kv4-G%CZ z7z0Y_X-?wsE7XUh!`|>KYDQ7KwCd0w^}tNz&pg0E*Pp>z_yX$s7uI&nrTzns!E`o& zGP4-9Bx~;>|4QjT8o0-Nh8cJbc>#>W7T1kqQP=07X0#mjdNtejgSP!^WWSo9Z9SfK z)qSa`eiKmR$3R7NPb? z4aVX@9ETsGCipMv!Ex!4ObkFxATXK}rFa_Z0gF-Z^)l2F>_FZqbHdgy+3UaC`W@_4 z_0LB3rJxeqQ}Ab7 zPhh=NA7-6~S}GrsG}DNhz(@A_CDcUzMrAx@xF*c{kK!brhH0n=%|{JfgG%KVRAyRG z_kDm~Y_sj{s6c;0Eny- z4{D%~ZToptio-Y$qeny@Sd0$!=TQM}we4>sFN8UP3N(ZYG-@RI*9-@75{((C)Qmx; zFb}nf6_Y;W&IuGLejDZ7K2v00vVK{qzdvn9AbcJh#|v@WIWq*PF* zP=XZwwo&w9({Dr2;~nLBEtum?8umt{sq?50VJW4IvZk|z4<|lN=}Ku1F83yRwjbK= z{XM>KNol21LsaxS_7@zA_I+ew)<6Bg+$XDfa{BC*GBERe7?uvA0Mr7=& zvW5PFBG;)bJveYh{P6I$z2RNU!iVcaweN&Z219iXq2rAmjc;`{zY^Y77jCNUsH+Wc z+c(s?df=#T+_C4-@~lyw?#};#9mqa?UwFk^ksg< delta 2949 zcmXxldrX&A9LMqRPw@u)Qf>mGfrw%t{^X{qF~Mw3vr*VuhEC}s>aZ~Ky5Y}T85oK^ zk|{`#&h!slfi_z;Wz#N-)gNXpotDlnhPGT=URL)0@H;)@{9eyF&v~BnJ>PSlhprcE zD}ooJ!y1gEl`@o)*2nA;jtS?7Uf#gjJ}1n^1x7!ZiF472tUsf;TY^{oE9Z zBT)B`<3|A&;r&>Oag1+kIN=_v#|&)2WIT=K_&f4vv!g;jk4vd9$A|F>YKH02Oae<$ zGu(_>_&(<2MNGxm7=pqHn8)~5%84%2V-j}YSo|85@_%s@rZ9cgr{geOjGFmo3}CZs z{|c44Zp^_uI0>^zivnDPYTtoDrSNl3CSo_z*GBQwBAkp$VKq*{TGSGqLIrRISv~W` zn=v^Xgj$*rn1Y3<36-HzUXAJ4gv`lK#FKxWeD4~%Q2}Ta8HbNx25Jc^u>{w<`dL)J ztEjcTgW3bJRAc}Z&`eaor_eq6Ug#5G`F6D&xhdabF4Ys|f2+1GJ$c>_S$KXWFW#q5__ZdTke?t_PR7lh;sd-G~a{0P1b%M9r)lb;CfS zX(4ia3oH~CCFTCKWZsXqcZv{@@Ku-5aTd& zH2G&^+guvdaTTgV18PQ}qF$$SuKk8(}4A-E>*^j)b7W{-0Ex~!@O|idSJ(2%F>X47R{v_%FmB@awI#h-_kfhjm$m&?H zK&U+vwFJeerCN!)zX3J#cBFsMzT`wpa1-^ZjALgcV*phzcJ;;18q`u9L?&(DpaT5I zT~B0zHIa#^l$WArT!m3sgL-ZwChPq_!iiG(Evn;XjKW*!$MBp`djcxZv8XkC0@beq z2jW`P{af)_+=olBAKz_Ve;KtT8!#FhaTw#=`s_mUvuE y{-Bn=59Mv|1AmflcgGq3?Wm4h$$Nd?q2XV2oJ?IG)v-EnywB^*KjwWj-un+`{WiM* diff --git a/locale/zh_CN/LC_MESSAGES/jumpserver-installer.po b/locale/zh_CN/LC_MESSAGES/jumpserver-installer.po index 27dee36d..ad98b217 100644 --- a/locale/zh_CN/LC_MESSAGES/jumpserver-installer.po +++ b/locale/zh_CN/LC_MESSAGES/jumpserver-installer.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-29 17:11+0800\n" +"POT-Creation-Date: 2024-07-04 19:12+0800\n" "PO-Revision-Date: 2021-01-21 19:15+0800\n" "Last-Translator: Bai \n" "Language-Team: Language locale/zh\n" @@ -16,49 +16,83 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: scripts/0_prepare.sh:14 -msgid "Starting to download Docker engine" -msgstr "开始下载 Docker 程序" +#: scripts/2_install_docker.sh:25 +msgid "Docker program does not exist" +msgstr "Docker 程序不存在" -#: scripts/0_prepare.sh:16 -msgid "Download docker fails, check the network is normal" -msgstr "下载 docker 失败, 请检查网络是否正常" +#: scripts/2_install_docker.sh:78 scripts/2_install_docker.sh:171 +msgid "Permission denied. pass..." +msgstr "Permission denied. 跳过..." -#: scripts/0_prepare.sh:21 -msgid "Using Docker cache" -msgstr "使用 Docker 缓存文件" +#: scripts/2_install_docker.sh:153 +msgid "Do you want to support IPv6" +msgstr "是否需要支持 IPv6" -#: scripts/0_prepare.sh:36 -msgid "Starting to download Docker Compose binary" -msgstr "开始下载 Docker Compose 程序" +#: scripts/2_install_docker.sh:203 +msgid "Install Docker" +msgstr "安装 Docker" -#: scripts/0_prepare.sh:38 -msgid "Download docker-compose fails, check the network is normal" -msgstr "下载 docker-compose 失败, 请检查网络是否正常" +#: scripts/2_install_docker.sh:206 +msgid "Configure Docker" +msgstr "配置 Docker" -#: scripts/0_prepare.sh:43 -msgid "Using Docker Compose cache" -msgstr "使用 Docker Compose 缓存文件" +#: scripts/2_install_docker.sh:208 +msgid "Start Docker" +msgstr "启动 Docker" -#: scripts/0_prepare.sh:55 scripts/7_upgrade.sh:24 -msgid "Docker is not running, please install and start" -msgstr "Docker 没有运行, 请安装并启动" +#: scripts/utils.sh:215 +msgid "no default" +msgstr "无默认值" -#: scripts/0_prepare.sh:81 -msgid "The image has been saved, skipping" -msgstr "已保存过该镜像, 跳过" +#: scripts/utils.sh:217 +msgid "default" +msgstr "默认为" -#: scripts/0_prepare.sh:85 -msgid "Save image" -msgstr "保存镜像" +#: scripts/utils.sh:265 +msgid "complete" +msgstr "完成" -#: scripts/0_prepare.sh:95 -msgid "Preparing Docker offline package" -msgstr "准备 Docker 离线包" +#: scripts/utils.sh:277 +msgid "fail" +msgstr "失败" -#: scripts/0_prepare.sh:99 -msgid "Preparing image offline package" -msgstr "准备镜像离线包" +#: scripts/utils.sh:414 +msgid "command not found, Please install it first" +msgstr "未找到命令, 请先安装" + +#: scripts/utils.sh:446 +msgid "Check Configuration File" +msgstr "检查配置文件" + +#: scripts/utils.sh:447 +msgid "Path to Configuration file" +msgstr "配置文件位置" + +#: scripts/utils.sh:593 scripts/1_config_jumpserver.sh:237 +#: scripts/7_upgrade.sh:210 +msgid "Failed to change the table structure" +msgstr "表结构变更失败" + +#: scripts/utils.sh:682 +msgid "Failed to pull image" +msgstr "拉取镜像失败" + +#: scripts/5_db_backup.sh:19 +msgid "Backing up" +msgstr "正在备份" + +#: scripts/5_db_backup.sh:45 scripts/1_config_jumpserver.sh:136 +#: scripts/6_db_restore.sh:46 +msgid "Invalid DB Engine selection" +msgstr "无效的 数据库 模式" + +#: scripts/5_db_backup.sh:51 scripts/5_db_backup.sh:52 +msgid "Backup failed" +msgstr "备份失败" + +#: scripts/5_db_backup.sh:56 +msgid "Backup succeeded! The backup file has been saved to" +msgstr "备份成功! 备份文件已存放至" #: scripts/1_config_jumpserver.sh:8 msgid "Configure Private Key" @@ -124,11 +158,6 @@ msgstr "是否使用外部 MySQL" msgid "Do you want to use external PostgreSQL" msgstr "是否使用外部 PostgreSQL" -#: scripts/1_config_jumpserver.sh:136 scripts/6_db_restore.sh:46 -#: scripts/5_db_backup.sh:45 -msgid "Invalid DB Engine selection" -msgstr "无效的 数据库 模式" - #: scripts/1_config_jumpserver.sh:144 msgid "Please enter Redis server IP" msgstr "请输入 Redis 的主机地址" @@ -193,140 +222,87 @@ msgstr "JumpServer rdp 端口" msgid "Init JumpServer Database" msgstr "初始化数据库" -#: scripts/1_config_jumpserver.sh:237 scripts/7_upgrade.sh:185 -#: scripts/utils.sh:565 -msgid "Failed to change the table structure" -msgstr "表结构变更失败" - -#: scripts/2_install_docker.sh:25 -msgid "Docker program does not exist" -msgstr "Docker 程序不存在" - -#: scripts/2_install_docker.sh:80 scripts/2_install_docker.sh:173 -msgid "Permission denied. pass..." -msgstr "Permission denied. 跳过..." - -#: scripts/2_install_docker.sh:155 -msgid "Do you want to support IPv6" -msgstr "是否需要支持 IPv6" +#: scripts/7_upgrade.sh:19 +msgid "The current version is not detected, please check" +msgstr "未检测到当前应用的有效版本, 请检查" -#: scripts/2_install_docker.sh:205 -msgid "Install Docker" -msgstr "安装 Docker" - -#: scripts/2_install_docker.sh:208 -msgid "Configure Docker" -msgstr "配置 Docker" - -#: scripts/2_install_docker.sh:210 -msgid "Start Docker" -msgstr "启动 Docker" - -#: scripts/3_load_images.sh:19 -msgid "Docker image not found" -msgstr "镜像文件没有发现" - -#: scripts/3_load_images.sh:36 -msgid "Docker image loaded, skipping" -msgstr "镜像已加载, 跳过" - -#: scripts/6_db_restore.sh:15 scripts/8_uninstall.sh:70 -msgid "Make sure you have a backup of data, this operation is not reversible" -msgstr "请确认已经备份好相关数据, 此操作不可逆" - -#: scripts/6_db_restore.sh:18 -msgid "file does not exist" -msgstr "文件不存在" - -#: scripts/6_db_restore.sh:24 -msgid "Start restoring database" -msgstr "开始还原数据库" - -#: scripts/6_db_restore.sh:52 +#: scripts/7_upgrade.sh:24 msgid "" -"Database recovery failed. Please check whether the database file is complete " -"or try to recover manually" -msgstr "数据库恢复失败. 请检查数据库文件是否完整, 或尝试手动恢复" +"Your current version does not meet the minimum requirements. Please upgrade " +"to" +msgstr "您当前的版本不符合最低要求, 请先升级至" -#: scripts/6_db_restore.sh:55 -msgid "Database recovered successfully" -msgstr "数据库恢复成功" - -#: scripts/6_db_restore.sh:66 -msgid "Format error" -msgstr "格式错误" - -#: scripts/6_db_restore.sh:70 -msgid "The backup file does not exist" -msgstr "备份文件不存在" +#: scripts/7_upgrade.sh:43 scripts/0_prepare.sh:55 +msgid "Docker is not running, please install and start" +msgstr "Docker 没有运行, 请安装并启动" -#: scripts/7_upgrade.sh:152 +#: scripts/7_upgrade.sh:177 msgid "Back up to" msgstr "备份至" -#: scripts/7_upgrade.sh:159 +#: scripts/7_upgrade.sh:184 msgid "Failed to backup the database. Continue to upgrade" msgstr "备份数据库失败, 继续升级吗" -#: scripts/7_upgrade.sh:165 +#: scripts/7_upgrade.sh:190 msgid "Skip database backup" msgstr "跳过备份数据库" -#: scripts/7_upgrade.sh:172 +#: scripts/7_upgrade.sh:197 msgid "" "Detected that the JumpServer container is running. Do you want to close the " "container and continue to upgrade" msgstr "检测到 JumpServer 正在运行, 是否需要关闭并继续升级" -#: scripts/7_upgrade.sh:187 +#: scripts/7_upgrade.sh:212 msgid "Failed to change the table structure. Continue to upgrade" msgstr "表结构变更失败, 是否继续" -#: scripts/7_upgrade.sh:200 +#: scripts/7_upgrade.sh:225 msgid "Do you need to clean up the old version image" msgstr "是否需要清理旧版本镜像文件" -#: scripts/7_upgrade.sh:213 +#: scripts/7_upgrade.sh:238 msgid "Do you need upgrade Docker binaries" msgstr "是否升级 Docker binaries" -#: scripts/7_upgrade.sh:236 +#: scripts/7_upgrade.sh:261 msgid "Do you need upgrade Docker Compose" msgstr "是否升级 Docker Compose" -#: scripts/7_upgrade.sh:254 +#: scripts/7_upgrade.sh:279 msgid "Are you sure you want to update the current version to" msgstr "是否将版本更新至" -#: scripts/7_upgrade.sh:266 scripts/4_install_jumpserver.sh:75 +#: scripts/7_upgrade.sh:294 scripts/4_install_jumpserver.sh:75 msgid "Loading Docker Image" msgstr "加载 Docker 镜像" -#: scripts/7_upgrade.sh:269 jmsctl.sh:60 +#: scripts/7_upgrade.sh:297 jmsctl.sh:61 msgid "Backup database" msgstr "备份数据库" -#: scripts/7_upgrade.sh:272 +#: scripts/7_upgrade.sh:300 msgid "Backup Configuration File" msgstr "备份配置文件" -#: scripts/7_upgrade.sh:275 +#: scripts/7_upgrade.sh:303 msgid "Apply database changes" msgstr "进行数据库变更" -#: scripts/7_upgrade.sh:276 +#: scripts/7_upgrade.sh:304 msgid "Changing database schema may take a while, please wait patiently" msgstr "表结构变更可能需要一段时间, 请耐心等待" -#: scripts/7_upgrade.sh:279 +#: scripts/7_upgrade.sh:307 msgid "Cleanup Image" msgstr "清理镜像" -#: scripts/7_upgrade.sh:282 +#: scripts/7_upgrade.sh:310 msgid "Upgrade Docker" msgstr "升级 Docker" -#: scripts/7_upgrade.sh:288 +#: scripts/7_upgrade.sh:316 msgid "Upgrade successfully. You can now restart the program" msgstr "升级成功, 可以重新启动程序了" @@ -345,6 +321,10 @@ msgstr "是否清理 Docker binaries" msgid "Do you need to clean up the Docker Compose binaries" msgstr "是否清理 Docker Compose binaries" +#: scripts/8_uninstall.sh:70 scripts/6_db_restore.sh:15 +msgid "Make sure you have a backup of data, this operation is not reversible" +msgstr "请确认已经备份好相关数据, 此操作不可逆" + #: scripts/8_uninstall.sh:74 msgid "Are you clean up JumpServer files" msgstr "确认清理 JumpServer 相关文件" @@ -357,10 +337,151 @@ msgstr "是否清理 Docker 镜像" msgid "Cleanup complete" msgstr "清理完成" -#: scripts/8_uninstall.sh:99 jmsctl.sh:56 +#: scripts/8_uninstall.sh:99 jmsctl.sh:57 msgid "Uninstall JumpServer" msgstr "卸载 JumpServer" +#: scripts/0_prepare.sh:14 +msgid "Starting to download Docker engine" +msgstr "开始下载 Docker 程序" + +#: scripts/0_prepare.sh:16 +msgid "Download docker fails, check the network is normal" +msgstr "下载 docker 失败, 请检查网络是否正常" + +#: scripts/0_prepare.sh:21 +msgid "Using Docker cache" +msgstr "使用 Docker 缓存文件" + +#: scripts/0_prepare.sh:36 +msgid "Starting to download Docker Compose binary" +msgstr "开始下载 Docker Compose 程序" + +#: scripts/0_prepare.sh:38 +msgid "Download docker-compose fails, check the network is normal" +msgstr "下载 docker-compose 失败, 请检查网络是否正常" + +#: scripts/0_prepare.sh:43 +msgid "Using Docker Compose cache" +msgstr "使用 Docker Compose 缓存文件" + +#: scripts/0_prepare.sh:81 +msgid "The image has been saved, skipping" +msgstr "已保存过该镜像, 跳过" + +#: scripts/0_prepare.sh:85 +msgid "Save image" +msgstr "保存镜像" + +#: scripts/0_prepare.sh:95 +msgid "Preparing Docker offline package" +msgstr "准备 Docker 离线包" + +#: scripts/0_prepare.sh:99 +msgid "Preparing image offline package" +msgstr "准备镜像离线包" + +#: scripts/3_load_images.sh:19 +msgid "Docker image not found" +msgstr "镜像文件没有发现" + +#: scripts/3_load_images.sh:36 +msgid "Docker image loaded, skipping" +msgstr "镜像已加载, 跳过" + +#: scripts/4_install_jumpserver.sh:10 +msgid "" +"The current Linux system does not support systemd management. Please deploy " +"docker by yourself before running this script again" +msgstr "" +"当前 Linux 系统不支持 systemd 管理, 请先自行部署 docker 后再重新运行此脚本" + +#: scripts/4_install_jumpserver.sh:14 +msgid "" +"The current Linux system does not support systemd management. Please deploy " +"docker-compose by yourself before running this script again" +msgstr "" +"当前 Linux 系统不支持 systemd 管理, 请先自行部署 docker-compose 后再重新运行" +"此脚本" + +#: scripts/4_install_jumpserver.sh:21 +msgid "The Installation is Complete" +msgstr "安装完成了" + +#: scripts/4_install_jumpserver.sh:32 +msgid "You can use the following command to start, and then visit" +msgstr "可以使用如下命令启动, 然后访问" + +#: scripts/4_install_jumpserver.sh:36 +msgid "Other management commands" +msgstr "其它一些管理命令" + +#: scripts/4_install_jumpserver.sh:41 +msgid "For more commands, you can enter ./jmsctl.sh --help to understand" +msgstr "更多还有一些命令, 你可以 ./jmsctl.sh --help 来了解" + +#: scripts/4_install_jumpserver.sh:43 +msgid "Web access" +msgstr "Web 访问" + +#: scripts/4_install_jumpserver.sh:50 +msgid "Default username" +msgstr "默认用户" + +#: scripts/4_install_jumpserver.sh:50 +msgid "Default password" +msgstr "默认密码" + +#: scripts/4_install_jumpserver.sh:53 +msgid "access" +msgstr "访问" + +#: scripts/4_install_jumpserver.sh:58 +msgid "More information" +msgstr "更多信息" + +#: scripts/4_install_jumpserver.sh:59 +msgid "Official Website" +msgstr "我们的官网" + +#: scripts/4_install_jumpserver.sh:60 +msgid "Documentation" +msgstr "我们的文档" + +#: scripts/4_install_jumpserver.sh:70 +msgid "Install and Configure Docker" +msgstr "安装配置 Docker" + +#: scripts/4_install_jumpserver.sh:79 +msgid "Install and Configure JumpServer" +msgstr "安装配置 JumpServer" + +#: scripts/6_db_restore.sh:18 +msgid "file does not exist" +msgstr "文件不存在" + +#: scripts/6_db_restore.sh:24 +msgid "Start restoring database" +msgstr "开始还原数据库" + +#: scripts/6_db_restore.sh:52 +msgid "" +"Database recovery failed. Please check whether the database file is complete " +"or try to recover manually" +msgstr "数据库恢复失败. 请检查数据库文件是否完整, 或尝试手动恢复" + +#: scripts/6_db_restore.sh:55 +msgid "Database recovered successfully" +msgstr "数据库恢复成功" + +#: scripts/6_db_restore.sh:66 +msgid "Format error" +msgstr "格式错误" + +#: scripts/6_db_restore.sh:70 +msgid "The backup file does not exist" +msgstr "备份文件不存在" + #: scripts/config.sh:16 msgid "Configuration ntp sync" msgstr "配置 ntp 同步" @@ -401,27 +522,27 @@ msgstr "请输入 HTTP 服务端口" msgid "Please enter HTTPS PORT" msgstr "请输入 HTTPS 服务端口" -#: scripts/config.sh:72 +#: scripts/config.sh:73 msgid "Please enter SSH PORT" msgstr "请输入 KOKO SSH 服务端口" -#: scripts/config.sh:77 +#: scripts/config.sh:78 msgid "Please enter MAGNUS MYSQL PORT" msgstr "请输入 MAGNUS MYSQL 服务端口" -#: scripts/config.sh:80 +#: scripts/config.sh:81 msgid "Please enter MAGNUS MARIADB PORT" msgstr "请输入 MAGNUS MARIADB 服务端口" -#: scripts/config.sh:83 +#: scripts/config.sh:84 msgid "Please enter MAGNUS REDIS PORT" msgstr "请输入 MAGNUS REDIS 服务端口" -#: scripts/config.sh:86 +#: scripts/config.sh:87 msgid "Please enter MAGNUS POSTGRESQL PORT" msgstr "请输入 MAGNUS POSTGRESQL 服务端口" -#: scripts/config.sh:89 +#: scripts/config.sh:90 msgid "Please enter MAGNUS SQLSERVER PORT" msgstr "请输入 MAGNUS SQLSERVER 服务端口" @@ -485,117 +606,6 @@ msgstr "是否需要继续添加或修改配置" msgid "Configuration file not found" msgstr "配置文件没有发现" -#: scripts/utils.sh:198 -msgid "no default" -msgstr "无默认值" - -#: scripts/utils.sh:200 -msgid "default" -msgstr "默认为" - -#: scripts/utils.sh:248 -msgid "complete" -msgstr "完成" - -#: scripts/utils.sh:260 -msgid "fail" -msgstr "失败" - -#: scripts/utils.sh:385 -msgid "command not found, Please install it first" -msgstr "未找到命令, 请先安装" - -#: scripts/utils.sh:417 -msgid "Check Configuration File" -msgstr "检查配置文件" - -#: scripts/utils.sh:418 -msgid "Path to Configuration file" -msgstr "配置文件位置" - -#: scripts/utils.sh:634 -msgid "Failed to pull image" -msgstr "拉取镜像失败" - -#: scripts/4_install_jumpserver.sh:10 -msgid "" -"The current Linux system does not support systemd management. Please deploy " -"docker by yourself before running this script again" -msgstr "" -"当前 Linux 系统不支持 systemd 管理, 请先自行部署 docker 后再重新运行此脚本" - -#: scripts/4_install_jumpserver.sh:14 -msgid "" -"The current Linux system does not support systemd management. Please deploy " -"docker-compose by yourself before running this script again" -msgstr "" -"当前 Linux 系统不支持 systemd 管理, 请先自行部署 docker-compose 后再重新运行" -"此脚本" - -#: scripts/4_install_jumpserver.sh:21 -msgid "The Installation is Complete" -msgstr "安装完成了" - -#: scripts/4_install_jumpserver.sh:32 -msgid "You can use the following command to start, and then visit" -msgstr "可以使用如下命令启动, 然后访问" - -#: scripts/4_install_jumpserver.sh:36 -msgid "Other management commands" -msgstr "其它一些管理命令" - -#: scripts/4_install_jumpserver.sh:41 -msgid "For more commands, you can enter ./jmsctl.sh --help to understand" -msgstr "更多还有一些命令, 你可以 ./jmsctl.sh --help 来了解" - -#: scripts/4_install_jumpserver.sh:43 -msgid "Web access" -msgstr "Web 访问" - -#: scripts/4_install_jumpserver.sh:50 -msgid "Default username" -msgstr "默认用户" - -#: scripts/4_install_jumpserver.sh:50 -msgid "Default password" -msgstr "默认密码" - -#: scripts/4_install_jumpserver.sh:53 -msgid "access" -msgstr "访问" - -#: scripts/4_install_jumpserver.sh:58 -msgid "More information" -msgstr "更多信息" - -#: scripts/4_install_jumpserver.sh:59 -msgid "Official Website" -msgstr "我们的官网" - -#: scripts/4_install_jumpserver.sh:60 -msgid "Documentation" -msgstr "我们的文档" - -#: scripts/4_install_jumpserver.sh:70 -msgid "Install and Configure Docker" -msgstr "安装配置 Docker" - -#: scripts/4_install_jumpserver.sh:79 -msgid "Install and Configure JumpServer" -msgstr "安装配置 JumpServer" - -#: scripts/5_db_backup.sh:19 -msgid "Backing up" -msgstr "正在备份" - -#: scripts/5_db_backup.sh:51 scripts/5_db_backup.sh:52 -msgid "Backup failed" -msgstr "备份失败" - -#: scripts/5_db_backup.sh:56 -msgid "Backup succeeded! The backup file has been saved to" -msgstr "备份成功! 备份文件已存放至" - #: jmsctl.sh:16 msgid "If you are upgrading from v1.5.x, please copy the config.txt To" msgstr "如果你是从 v1.5.x 升级的, 请 copy 之前目录中的 config.txt 到" @@ -612,81 +622,70 @@ msgstr "JumpServer 部署管理脚本" msgid "Install JumpServer" msgstr "安装 JumpServer" -#: jmsctl.sh:50 +#: jmsctl.sh:48 +msgid "Upgrade JumpServer" +msgstr "升级 JumpServer" + +#: jmsctl.sh:51 msgid "Configuration Tools" msgstr "配置工具" -#: jmsctl.sh:51 +#: jmsctl.sh:52 msgid "Start JumpServer" msgstr "启动 JumpServer" -#: jmsctl.sh:52 +#: jmsctl.sh:53 msgid "Stop JumpServer" msgstr "停止 JumpServer" -#: jmsctl.sh:53 +#: jmsctl.sh:54 msgid "Restart JumpServer" msgstr "重启 JumpServer" -#: jmsctl.sh:54 +#: jmsctl.sh:55 msgid "Check JumpServer" msgstr "检查 JumpServer" -#: jmsctl.sh:55 +#: jmsctl.sh:56 msgid "Offline JumpServer" msgstr "下线 JumpServer" -#: jmsctl.sh:59 +#: jmsctl.sh:60 msgid "Loading docker image" msgstr "加载 Docker 镜像" -#: jmsctl.sh:61 +#: jmsctl.sh:62 msgid "Data recovery through database backup file" msgstr "通过数据库备份文件恢复数据" -#: jmsctl.sh:62 +#: jmsctl.sh:63 msgid "Execute the original docker compose command" msgstr "执行原始 docker compose 命令" -#: jmsctl.sh:63 +#: jmsctl.sh:64 msgid "View log" msgstr "查看日志" -#: jmsctl.sh:118 +#: jmsctl.sh:119 msgid "The current version is up to date" msgstr "当前版本已是最新" -#: jmsctl.sh:123 +#: jmsctl.sh:124 msgid "The latest version is" msgstr "最新版本是" -#: jmsctl.sh:127 +#: jmsctl.sh:128 msgid "The current version is" msgstr "当前版本是" -#: jmsctl.sh:172 jmsctl.sh:178 +#: jmsctl.sh:173 jmsctl.sh:179 msgid "Unsupported Operating System Error" msgstr "错误: 不支持的操作系统" -#: jmsctl.sh:173 +#: jmsctl.sh:174 msgid "macOS installer please see" msgstr "macOS 安装请参考" -#: jmsctl.sh:179 +#: jmsctl.sh:180 msgid "Windows installer please see" msgstr "Windows 安装请参考" - -#~ msgid "Please enter the access IP or domain name of JumpServer" -#~ msgstr "请输入 JumpServer 的访问 IP 或者 域名" - -#~ msgid "Configure MySQL" -#~ msgstr "配置 MySQL" - -#~ msgid "There are updates available currently. Do you want to update" -#~ msgstr "检测到 Docker 版本有更新, 是否更新" - -#~ msgid "Failed to connect to database, please reset" -#~ msgstr "测试连接数据库失败, 请重新设置" - -#~ msgid "Failed to connect to redis, please reset" -#~ msgstr "测试连接 Redis 失败, 请重新设置" diff --git a/locale/zh_Hant/LC_MESSAGES/jumpserver-installer.mo b/locale/zh_Hant/LC_MESSAGES/jumpserver-installer.mo index c983ac591425d1760147681182022b507e4dc883..26c12c1cdb66310c28799986737ad2935e29a779 100644 GIT binary patch delta 4292 zcmZ|Rd2p508OQMh1PNPMk`TcVUJ6(UNeTp%MF>j(LBKRYs33)qyo8k8n{aQ!rV>Fg zi7^41gw3=Xwx%Gcy+SAjWv1FrM~9(x25oVnQ|?W={2`+bQ*mg&zx$rrj5D6eb3gBS zm$N+Qyf2(8YW7!tGBBpeP>vDF#6#VU`4pe%#Si7fzQzo~KjU!x3?IOOamMJD1=giF znEGn$hg*?bO$}z^0UU+z;%K~uGmWV+?1Op8pIO6?2DlMZuoe^P-<;%tHq2#A#j7|B?_d$$H^6J)S!*Nu zIDZ`HVEjODhRbm*^;*;n+b|t(;3SNTXK0$SNz4kzBa<{UQA?AD4wj)Nv=5c?)A)US51E_!B8mL#AeL5TGHL+h ztaEWL^%cl!n3pjZU$^xb7F72qqSiK*AMJr`>uS`1wxI@m0D07$MgGi{!Q@{f?64PN zc$&$Xp~xW3M09WwY6d=Ae*v|Ir|tPaqSp2^)N}DPD#xNanuA)pRj7IZ#Sm)a&#-K8;sU9WLT&4Im%2*><5eTLVtQ6G+z0NA~<}jHTX-hcwf8 z)PPfPDo(>CxC!sk(BI)eGkp*B;BD-I%2y1;qBdt=R7b;64L^jM;e4Feg)bgz$u2V+ zP3Rgw%H$pFi3xoEl;ITA1jb@N`ZqJ|g(ax>d?jklccMNZzrq=K12vFg+@uCFQ4P+s z=2_QReW(F!L%vm}!Fn9~QE$UarS$jq#5L51BZBJS3)GBy@Y1S26xHE4b^MESI^y#Y9|Y|NsCg+zf!TC6I#o9oPw8;ZD77al3<4N zj%lXZ$TFK1sE)VeOx%Z>`JZqRerm6$rFqX~p)&gzYAFg(OIcCLfks$^%0vrlWEW90 zc^}o$Eo%(vQ9TLucBERfP$^!DeXtI*@GxqEe?fKl4^$@ZqS~oU%J5R0ikjhkRO(k* zw<2$pX+k~NhFZg`w*DpR3m3u@yc!P%%(u0>_06m{Qj?2Cu&`Cp)BehIaNH&FN8!G72;(|djxuBAQ+e}V@w`u=yD z=&fBmD#eR%AiAhMum#o7etZ4|Y7_n%SK-Gv0H;mzGPxKvKtJmIQ^<>8>QMtdkIKMx ztkeuY=b#trKX$s%8cyCH%zZ=o$LgzhX)gNr--SXX183pWH`?HH3;w1PHQib`UBrc$j^tB~f`f`pdr$ zsEw%%sVEaFJv_{FQuBYBSU}7r96~7{PAntzChR7v2^FPZWvWN?_noHhhk8@EQPNj%= zK6>PBP93fw1`+#-T4ED%j99JtKg@wjp-1!$Sj_QyBAs}^o}Z3;3EnERk@z8@&8BYz zZ&GxFfhpDx<&a18bKIZfX|^u(VS0>+SN_NAOsA4)kA2n`v4m(Lg2Y0iflz5C^fgoY zDe)BXpemipGaT_WGk zhTXz6r>w-yXATAH-GU7b{Zo=cGg6LqiCtLXE6ZaV4Id19f63#e6#=K9A`o!>fF>f3dH^=LFo16~zJ9$KAmUC&z2QqO2&8U+6mJrJ-LsZ+2bP zzN;k?Y6`zr)hT=JjjcB?HFt!nBKr@8FPyr0@j|4zE_|p}nf&hi9WN!F?`~K(qP|Z@ z>*?^B!{N5$;oWVa?jr}pbc>v93=JNg&^1$yHC4AC-sODLnG<1HET~V z45gyn(~2ELu-j<(R>chr;S(9W@Ay2j=)YgVqL;gj@Hp;yy4cbgn(J{jI|Hgf)z zaP@2LFP;h4)J3Xlm}+}#Egdq5NOO%wQ&SyjekIN6I8_@tc_i}E@zAL84|eJ4e6tdH z6W*B|+1c9ObdDx?%zNPG`MSt&-s(6PiZnlS^HP1si5-#GcSc(Y@2(ElRkgoyxT7l6 Tkd&F#{bXaLrMh8dX3l>B#1Ds? delta 3492 zcmX}udr*{B7{~DgtcVB#DuR+NV1ieat9QXbK_V}hXqJ{2Lh(i@nu0A#ifGtn5mB1_ z!))-9Gq!oR8vm%#K}Ss+XPm~dnban0EOAQ9nfm^A&vu6A{hV|5efOO6ob#@JwBk^i z>sEKiPD5!Wo*^DNjJbvvyKtezh8xohdt(9)$1E(yP;9U^VQ<=dF#=B^f93+0bi9E% z*tMH6J+TO5jd7XzRJzi!9`(Q$jKn6?jr&m(JB`ob4b+65Vjt|mXwjI0VVH+{emZJG z3-DR2LEYDi{F$R%1~I-lN5x6UuULj*JgqNSZQYE^X*XjoI--0lD!{?CYj6Oz;ZVGa znfNazVrF+^`r&NMz#3HlQH*1JbDc^G{*FqqvxhNBI04mOjD2w%YUOP>48OMh4^Wv4 zCtYb6hof-{YJv^6{}?KRKjSD2Cmk;8CZEa#d=-_#k1-n$A$w%*qbA^Bbh2&|k-3^w z)Yjx-JkG~t+=R@@9JGFA{SGzWUF$!+$p1t-B4d0hFTrBkWww19^*}pnFK?sv{BP92 z(acU0OG8a`8W-KS1mm#I_U}c;G$)Zq&1HruwRN9hI$n2C(ab`4dLTMcdo~&4u?lrK zn^BoKZrkmsiQY%Oh7pXa&-+-1q4#Y-O<+0>!gADtcB1ZgoutB_xx_^?{sna?yO7s< zY(PygiVqWT0P3_CqP}PqYGuu+OdLkNC0B6+Ml*X2(oagKNY4Qsy`j|y5`_`EJF?aDeC^ysQWHiZ(8qR z6yuvmR5V~Pqw||#oYqv-K)I-t&9LnSsQ0}RH9#$D0dCtqfEw^D>UF$eKmP;uc6ILW z`+N?%bYmHnJY0<<@f32ed5B7V49imrGf-bR74=KE7CC=rKkB}7_VZilT@W|xt#P6z zIs(;Sh#V`kFq!>V$3}bO9(%**$e(HFqQlpL%0wt9PkYw~M`01NJ7xdY)7T`N7Pn4K<#A!CrvAfMy+%x>bXMeTx$jD zwAWc%P#OIUHSk@`#tzhi(p|jl8Xy;yiCL&Gu0Tzw4wd5F)?>(dHCIvhcc8W^Y>2O& ziuz$HL}g|X#$!Dyqix8pnk%;7^(Pg5K@1zJJsFGfI0v0rjrzh?>oMDZ8MQSJY&$r` zmzgBgR^%dIZOT#Kv&(t{wSXH)MqTC!6|FRCm@gB_r~${I9-N6`ScST86DngZ7>WV2kO3V!+ohvL_ME|3$Oso^;37q-q4GarIaS2wjdjokz$O%3fo_cI$Um? zizhG&qtkquOGZts069LU1U0c*)EU}`TF@B`WqfnqesB$yvilf}vFW}EI8p6!*ah=! zdkSh|Gf^umMSXEKYQU`+fZFc~1Uuy|FK}H+C<_|jY$9~3bwJ)F{DlnuUove?1Ne&$ z=33hz3ErRK?f8c6Be7-`p+#{{z2^nYW?d+}!Y*&>nrLJZN`DTa5>Jd%g))nHiwGj# zBvc}Oc(2pAme{rq^G>4GwwI#LLjkdZ;JA59G1r&1{#{g@zCQ21Y0oQ(*NH8}MnYvP zv7UHI4ayASd7=|hMW}QprV?dDHlcI!4l$PSm*rIE5&Q(04a)x>;(bD;JMp%+=DVx` zH<3WRNYoOEgvvxBgIGs=NK7I04^R!EH>fM&FFHTfgvMKFI~#1<+sx&v!=w}YthdLQ z_i#5ci5N{RB2)s254<)0&uATk^|tQEL8Zdqz))Lnw$9Xil4wK|g+v~~Pqrx~{AD#2 zo%(Wr2kN!kM&uLI36&AVD?|?>hG-G2=Qj7ntZDxN#w1l) diff --git a/locale/zh_Hant/LC_MESSAGES/jumpserver-installer.po b/locale/zh_Hant/LC_MESSAGES/jumpserver-installer.po index ccffdd30..d7be8a0d 100644 --- a/locale/zh_Hant/LC_MESSAGES/jumpserver-installer.po +++ b/locale/zh_Hant/LC_MESSAGES/jumpserver-installer.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-29 17:07+0800\n" +"POT-Creation-Date: 2024-07-04 19:12+0800\n" "PO-Revision-Date: 2024-04-09 18:25+0800\n" "Last-Translator: 小冯 \n" "Language-Team: Language locale/zh\n" @@ -16,49 +16,83 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: scripts/0_prepare.sh:14 -msgid "Starting to download Docker engine" -msgstr "開始下載 Docker 程序" +#: scripts/2_install_docker.sh:25 +msgid "Docker program does not exist" +msgstr "Docker 程序不存在" -#: scripts/0_prepare.sh:16 -msgid "Download docker fails, check the network is normal" -msgstr "下載 docker 失敗, 請檢查網路是否正常" +#: scripts/2_install_docker.sh:78 scripts/2_install_docker.sh:171 +msgid "Permission denied. pass..." +msgstr "Permission denied. 跳過..." -#: scripts/0_prepare.sh:21 -msgid "Using Docker cache" -msgstr "使用 Docker 快取文" +#: scripts/2_install_docker.sh:153 +msgid "Do you want to support IPv6" +msgstr "是否需要支持 IPv6" -#: scripts/0_prepare.sh:36 -msgid "Starting to download Docker Compose binary" -msgstr "開始下載 Docker Compose 程序" +#: scripts/2_install_docker.sh:203 +msgid "Install Docker" +msgstr "安裝 Docker" -#: scripts/0_prepare.sh:38 -msgid "Download docker-compose fails, check the network is normal" -msgstr "下載 docker-compose 失敗, 請檢查網路是否正常" +#: scripts/2_install_docker.sh:206 +msgid "Configure Docker" +msgstr "配置 Docker" -#: scripts/0_prepare.sh:43 -msgid "Using Docker Compose cache" -msgstr "使用 Docker Compose 快取文件" +#: scripts/2_install_docker.sh:208 +msgid "Start Docker" +msgstr "啟動 Docker" -#: scripts/0_prepare.sh:55 scripts/7_upgrade.sh:24 -msgid "Docker is not running, please install and start" -msgstr "Docker 沒有運行, 請安裝並啟動" +#: scripts/utils.sh:215 +msgid "no default" +msgstr "無預設值" -#: scripts/0_prepare.sh:81 -msgid "The image has been saved, skipping" -msgstr "已保存過該鏡像, 跳過" +#: scripts/utils.sh:217 +msgid "default" +msgstr "預設為" -#: scripts/0_prepare.sh:85 -msgid "Save image" -msgstr "保存鏡像" +#: scripts/utils.sh:265 +msgid "complete" +msgstr "完成" -#: scripts/0_prepare.sh:95 -msgid "Preparing Docker offline package" -msgstr "準備 Docker 離線包" +#: scripts/utils.sh:277 +msgid "fail" +msgstr "失敗" -#: scripts/0_prepare.sh:99 -msgid "Preparing image offline package" -msgstr "準備鏡像離線包" +#: scripts/utils.sh:414 +msgid "command not found, Please install it first" +msgstr "未找到命令, 請先安裝" + +#: scripts/utils.sh:446 +msgid "Check Configuration File" +msgstr "檢查配置文件" + +#: scripts/utils.sh:447 +msgid "Path to Configuration file" +msgstr "配置檔案位置" + +#: scripts/utils.sh:593 scripts/1_config_jumpserver.sh:237 +#: scripts/7_upgrade.sh:210 +msgid "Failed to change the table structure" +msgstr "表結構變更失敗" + +#: scripts/utils.sh:682 +msgid "Failed to pull image" +msgstr "拉取鏡像失敗" + +#: scripts/5_db_backup.sh:19 +msgid "Backing up" +msgstr "正在備份" + +#: scripts/5_db_backup.sh:45 scripts/1_config_jumpserver.sh:136 +#: scripts/6_db_restore.sh:46 +msgid "Invalid DB Engine selection" +msgstr "無效的 資料庫 模式" + +#: scripts/5_db_backup.sh:51 scripts/5_db_backup.sh:52 +msgid "Backup failed" +msgstr "備份失敗" + +#: scripts/5_db_backup.sh:56 +msgid "Backup succeeded! The backup file has been saved to" +msgstr "備份成功! 備份文件已存放至" #: scripts/1_config_jumpserver.sh:8 msgid "Configure Private Key" @@ -94,7 +128,7 @@ msgstr "請輸入資料庫的主機地址" #: scripts/1_config_jumpserver.sh:74 msgid "Can not use localhost as DB server IP" -msgstr "" +msgstr "無法將 localhost 用作資料庫伺服器 IP" #: scripts/1_config_jumpserver.sh:77 msgid "Please enter DB server port" @@ -124,18 +158,13 @@ msgstr "是否使用外部 MySQL" msgid "Do you want to use external PostgreSQL" msgstr "是否使用外部 PostgreSQL" -#: scripts/1_config_jumpserver.sh:136 scripts/6_db_restore.sh:46 -#: scripts/5_db_backup.sh:45 -msgid "Invalid DB Engine selection" -msgstr "" - #: scripts/1_config_jumpserver.sh:144 msgid "Please enter Redis server IP" msgstr "請輸入 Redis 的主機地址" #: scripts/1_config_jumpserver.sh:146 msgid "Can not use localhost as Redis server IP" -msgstr "" +msgstr "無法將 localhost 用作 Redis 伺服器 IP" #: scripts/1_config_jumpserver.sh:149 msgid "Please enter Redis server port" @@ -147,7 +176,7 @@ msgstr "請輸入 Redis 的密碼" #: scripts/1_config_jumpserver.sh:160 msgid "Please enter Redis Sentinel hosts" -msgstr "" +msgstr "請輸入 Redis Sentinel 的主機地址" #: scripts/1_config_jumpserver.sh:162 msgid "Please enter Redis Sentinel password" @@ -167,7 +196,7 @@ msgstr "是否使用外部 Redis" #: scripts/1_config_jumpserver.sh:208 msgid "Invalid Redis Engine selection" -msgstr "" +msgstr "無效的 Redis 模式" #: scripts/1_config_jumpserver.sh:214 msgid "Configure External Access" @@ -193,140 +222,87 @@ msgstr "JumpServer rdp 埠" msgid "Init JumpServer Database" msgstr "初始化資料庫" -#: scripts/1_config_jumpserver.sh:237 scripts/7_upgrade.sh:185 -#: scripts/utils.sh:565 -msgid "Failed to change the table structure" -msgstr "表結構變更失敗" - -#: scripts/2_install_docker.sh:25 -msgid "Docker program does not exist" -msgstr "Docker 程序不存在" - -#: scripts/2_install_docker.sh:80 scripts/2_install_docker.sh:173 -msgid "Permission denied. pass..." -msgstr "" - -#: scripts/2_install_docker.sh:155 -msgid "Do you want to support IPv6" -msgstr "是否需要支持 IPv6" - -#: scripts/2_install_docker.sh:205 -msgid "Install Docker" -msgstr "安裝 Docker" - -#: scripts/2_install_docker.sh:208 -msgid "Configure Docker" -msgstr "配置 Docker" - -#: scripts/2_install_docker.sh:210 -msgid "Start Docker" -msgstr "啟動 Docker" - -#: scripts/3_load_images.sh:19 -msgid "Docker image not found" -msgstr "鏡像文件沒有發現" - -#: scripts/3_load_images.sh:36 -msgid "Docker image loaded, skipping" -msgstr "鏡像已載入, 跳過" - -#: scripts/6_db_restore.sh:15 scripts/8_uninstall.sh:70 -msgid "Make sure you have a backup of data, this operation is not reversible" -msgstr "請確認已經備份好相關數據, 此操作不可逆" - -#: scripts/6_db_restore.sh:18 -msgid "file does not exist" -msgstr "文件不存在" - -#: scripts/6_db_restore.sh:24 -msgid "Start restoring database" -msgstr "開始還原資料庫" +#: scripts/7_upgrade.sh:19 +msgid "The current version is not detected, please check" +msgstr "未偵測到目前應用程式的有效版本, 請檢查" -#: scripts/6_db_restore.sh:52 +#: scripts/7_upgrade.sh:24 msgid "" -"Database recovery failed. Please check whether the database file is complete " -"or try to recover manually" -msgstr "資料庫恢復失敗. 請檢查資料庫文件是否完整, 或嘗試手動恢復" +"Your current version does not meet the minimum requirements. Please upgrade " +"to" +msgstr "您當前的版本不滿足最低要求, 請先升級至" -#: scripts/6_db_restore.sh:55 -msgid "Database recovered successfully" -msgstr "資料庫恢復成功" - -#: scripts/6_db_restore.sh:66 -msgid "Format error" -msgstr "格式錯誤" - -#: scripts/6_db_restore.sh:70 -msgid "The backup file does not exist" -msgstr "備份文件不存在" +#: scripts/7_upgrade.sh:43 scripts/0_prepare.sh:55 +msgid "Docker is not running, please install and start" +msgstr "Docker 沒有運行, 請安裝並啟動" -#: scripts/7_upgrade.sh:152 +#: scripts/7_upgrade.sh:177 msgid "Back up to" msgstr "備份至" -#: scripts/7_upgrade.sh:159 +#: scripts/7_upgrade.sh:184 msgid "Failed to backup the database. Continue to upgrade" msgstr "備份資料庫失敗, 繼續升級嗎" -#: scripts/7_upgrade.sh:165 +#: scripts/7_upgrade.sh:190 msgid "Skip database backup" msgstr "跳過備份資料庫" -#: scripts/7_upgrade.sh:172 +#: scripts/7_upgrade.sh:197 msgid "" "Detected that the JumpServer container is running. Do you want to close the " "container and continue to upgrade" msgstr "檢測到 JumpServer 正在運行, 是否需要關閉並繼續升級" -#: scripts/7_upgrade.sh:187 +#: scripts/7_upgrade.sh:212 msgid "Failed to change the table structure. Continue to upgrade" msgstr "表結構變更失敗, 是否繼續" -#: scripts/7_upgrade.sh:200 +#: scripts/7_upgrade.sh:225 msgid "Do you need to clean up the old version image" msgstr "是否需要清理舊版本鏡像文件" -#: scripts/7_upgrade.sh:213 +#: scripts/7_upgrade.sh:238 msgid "Do you need upgrade Docker binaries" msgstr "是否升級 Docker binaries" -#: scripts/7_upgrade.sh:236 +#: scripts/7_upgrade.sh:261 msgid "Do you need upgrade Docker Compose" msgstr "是否升級 Docker Compose" -#: scripts/7_upgrade.sh:254 +#: scripts/7_upgrade.sh:279 msgid "Are you sure you want to update the current version to" msgstr "是否將版本更新至" -#: scripts/7_upgrade.sh:266 scripts/4_install_jumpserver.sh:75 +#: scripts/7_upgrade.sh:294 scripts/4_install_jumpserver.sh:75 msgid "Loading Docker Image" msgstr "載入 Docker 鏡像" -#: scripts/7_upgrade.sh:269 jmsctl.sh:60 +#: scripts/7_upgrade.sh:297 jmsctl.sh:61 msgid "Backup database" msgstr "備份資料庫" -#: scripts/7_upgrade.sh:272 +#: scripts/7_upgrade.sh:300 msgid "Backup Configuration File" msgstr "備份配置文件" -#: scripts/7_upgrade.sh:275 +#: scripts/7_upgrade.sh:303 msgid "Apply database changes" msgstr "進行資料庫變更" -#: scripts/7_upgrade.sh:276 +#: scripts/7_upgrade.sh:304 msgid "Changing database schema may take a while, please wait patiently" msgstr "資料表結構變更可能需要一段時間, 請耐心等待" -#: scripts/7_upgrade.sh:279 +#: scripts/7_upgrade.sh:307 msgid "Cleanup Image" msgstr "清理鏡像" -#: scripts/7_upgrade.sh:282 +#: scripts/7_upgrade.sh:310 msgid "Upgrade Docker" msgstr "升級 Docker" -#: scripts/7_upgrade.sh:288 +#: scripts/7_upgrade.sh:316 msgid "Upgrade successfully. You can now restart the program" msgstr "升級成功, 可以重新啟動程序了" @@ -345,6 +321,10 @@ msgstr "確認清理 Docker binaries" msgid "Do you need to clean up the Docker Compose binaries" msgstr "確認清理 Docker Compose binaries" +#: scripts/8_uninstall.sh:70 scripts/6_db_restore.sh:15 +msgid "Make sure you have a backup of data, this operation is not reversible" +msgstr "請確認已經備份好相關數據, 此操作不可逆" + #: scripts/8_uninstall.sh:74 msgid "Are you clean up JumpServer files" msgstr "確認清理 JumpServer 相關文件" @@ -357,10 +337,151 @@ msgstr "是否清理 Docker 鏡像" msgid "Cleanup complete" msgstr "清理完成" -#: scripts/8_uninstall.sh:99 jmsctl.sh:56 +#: scripts/8_uninstall.sh:99 jmsctl.sh:57 msgid "Uninstall JumpServer" msgstr "卸載 JumpServer" +#: scripts/0_prepare.sh:14 +msgid "Starting to download Docker engine" +msgstr "開始下載 Docker 程序" + +#: scripts/0_prepare.sh:16 +msgid "Download docker fails, check the network is normal" +msgstr "下載 docker 失敗, 請檢查網路是否正常" + +#: scripts/0_prepare.sh:21 +msgid "Using Docker cache" +msgstr "使用 Docker 快取文" + +#: scripts/0_prepare.sh:36 +msgid "Starting to download Docker Compose binary" +msgstr "開始下載 Docker Compose 程序" + +#: scripts/0_prepare.sh:38 +msgid "Download docker-compose fails, check the network is normal" +msgstr "下載 docker-compose 失敗, 請檢查網路是否正常" + +#: scripts/0_prepare.sh:43 +msgid "Using Docker Compose cache" +msgstr "使用 Docker Compose 快取文件" + +#: scripts/0_prepare.sh:81 +msgid "The image has been saved, skipping" +msgstr "已保存過該鏡像, 跳過" + +#: scripts/0_prepare.sh:85 +msgid "Save image" +msgstr "保存鏡像" + +#: scripts/0_prepare.sh:95 +msgid "Preparing Docker offline package" +msgstr "準備 Docker 離線包" + +#: scripts/0_prepare.sh:99 +msgid "Preparing image offline package" +msgstr "準備鏡像離線包" + +#: scripts/3_load_images.sh:19 +msgid "Docker image not found" +msgstr "鏡像文件沒有發現" + +#: scripts/3_load_images.sh:36 +msgid "Docker image loaded, skipping" +msgstr "鏡像已載入, 跳過" + +#: scripts/4_install_jumpserver.sh:10 +msgid "" +"The current Linux system does not support systemd management. Please deploy " +"docker by yourself before running this script again" +msgstr "" +"當前 Linux 系統不支持 systemd 管理, 請先自行部署 docker 後再重新運行此腳本" + +#: scripts/4_install_jumpserver.sh:14 +msgid "" +"The current Linux system does not support systemd management. Please deploy " +"docker-compose by yourself before running this script again" +msgstr "" +"當前 Linux 系統不支持 systemd 管理, 請先自行部署 docker-compose 後再重新運行" +"此腳本" + +#: scripts/4_install_jumpserver.sh:21 +msgid "The Installation is Complete" +msgstr "安裝完成了" + +#: scripts/4_install_jumpserver.sh:32 +msgid "You can use the following command to start, and then visit" +msgstr "可以使用如下命令啟動, 然後訪問" + +#: scripts/4_install_jumpserver.sh:36 +msgid "Other management commands" +msgstr "其它一些管理命令" + +#: scripts/4_install_jumpserver.sh:41 +msgid "For more commands, you can enter ./jmsctl.sh --help to understand" +msgstr "更多還有一些命令, 你可以 ./jmsctl.sh --help 來了解" + +#: scripts/4_install_jumpserver.sh:43 +msgid "Web access" +msgstr "Web 訪問" + +#: scripts/4_install_jumpserver.sh:50 +msgid "Default username" +msgstr "預設用戶" + +#: scripts/4_install_jumpserver.sh:50 +msgid "Default password" +msgstr "默認密碼" + +#: scripts/4_install_jumpserver.sh:53 +msgid "access" +msgstr "訪問" + +#: scripts/4_install_jumpserver.sh:58 +msgid "More information" +msgstr "更多資訊" + +#: scripts/4_install_jumpserver.sh:59 +msgid "Official Website" +msgstr "我們的官網" + +#: scripts/4_install_jumpserver.sh:60 +msgid "Documentation" +msgstr "我們的文檔" + +#: scripts/4_install_jumpserver.sh:70 +msgid "Install and Configure Docker" +msgstr "安裝配置 Docker" + +#: scripts/4_install_jumpserver.sh:79 +msgid "Install and Configure JumpServer" +msgstr "安裝配置 JumpServer" + +#: scripts/6_db_restore.sh:18 +msgid "file does not exist" +msgstr "檔案不存在" + +#: scripts/6_db_restore.sh:24 +msgid "Start restoring database" +msgstr "開始還原資料庫" + +#: scripts/6_db_restore.sh:52 +msgid "" +"Database recovery failed. Please check whether the database file is complete " +"or try to recover manually" +msgstr "資料庫恢復失敗. 請檢查資料庫文件是否完整, 或嘗試手動恢復" + +#: scripts/6_db_restore.sh:55 +msgid "Database recovered successfully" +msgstr "資料庫恢復成功" + +#: scripts/6_db_restore.sh:66 +msgid "Format error" +msgstr "格式錯誤" + +#: scripts/6_db_restore.sh:70 +msgid "The backup file does not exist" +msgstr "備份文件不存在" + #: scripts/config.sh:16 msgid "Configuration ntp sync" msgstr "配置 ntp 同步" @@ -401,27 +522,27 @@ msgstr "請輸入 HTTP 服務埠" msgid "Please enter HTTPS PORT" msgstr "請輸入 HTTPS 服務埠" -#: scripts/config.sh:72 +#: scripts/config.sh:73 msgid "Please enter SSH PORT" msgstr "請輸入 KOKO SSH 服務埠" -#: scripts/config.sh:77 +#: scripts/config.sh:78 msgid "Please enter MAGNUS MYSQL PORT" msgstr "請輸入 MAGNUS MYSQL 服務埠" -#: scripts/config.sh:80 +#: scripts/config.sh:81 msgid "Please enter MAGNUS MARIADB PORT" msgstr "請輸入 MAGNUS MARIADB 服務埠" -#: scripts/config.sh:83 +#: scripts/config.sh:84 msgid "Please enter MAGNUS REDIS PORT" msgstr "請輸入 MAGNUS REDIS 服務埠" -#: scripts/config.sh:86 +#: scripts/config.sh:87 msgid "Please enter MAGNUS POSTGRESQL PORT" msgstr "請輸入 MAGNUS POSTGRESQL 服務埠" -#: scripts/config.sh:89 +#: scripts/config.sh:90 msgid "Please enter MAGNUS SQLSERVER PORT" msgstr "請輸入 MAGNUS SQLSERVER 服務埠" @@ -485,117 +606,6 @@ msgstr "是否需要繼續添加或修改配置" msgid "Configuration file not found" msgstr "配置文件沒有發現" -#: scripts/utils.sh:198 -msgid "no default" -msgstr "無預設值" - -#: scripts/utils.sh:200 -msgid "default" -msgstr "預設為" - -#: scripts/utils.sh:248 -msgid "complete" -msgstr "完成" - -#: scripts/utils.sh:260 -msgid "fail" -msgstr "失敗" - -#: scripts/utils.sh:385 -msgid "command not found, Please install it first" -msgstr "未找到命令, 請先安裝" - -#: scripts/utils.sh:417 -msgid "Check Configuration File" -msgstr "檢查配置文件" - -#: scripts/utils.sh:418 -msgid "Path to Configuration file" -msgstr "配置檔案位置" - -#: scripts/utils.sh:634 -msgid "Failed to pull image" -msgstr "拉取鏡像失敗" - -#: scripts/4_install_jumpserver.sh:10 -msgid "" -"The current Linux system does not support systemd management. Please deploy " -"docker by yourself before running this script again" -msgstr "" -"當前 Linux 系統不支持 systemd 管理, 請先自行部署 docker 後再重新運行此腳本" - -#: scripts/4_install_jumpserver.sh:14 -msgid "" -"The current Linux system does not support systemd management. Please deploy " -"docker-compose by yourself before running this script again" -msgstr "" -"當前 Linux 系統不支持 systemd 管理, 請先自行部署 docker-compose 後再重新運行" -"此腳本" - -#: scripts/4_install_jumpserver.sh:21 -msgid "The Installation is Complete" -msgstr "安裝完成了" - -#: scripts/4_install_jumpserver.sh:32 -msgid "You can use the following command to start, and then visit" -msgstr "可以使用如下命令啟動, 然後訪問" - -#: scripts/4_install_jumpserver.sh:36 -msgid "Other management commands" -msgstr "其它一些管理命令" - -#: scripts/4_install_jumpserver.sh:41 -msgid "For more commands, you can enter ./jmsctl.sh --help to understand" -msgstr "更多還有一些命令, 你可以 ./jmsctl.sh --help 來了解" - -#: scripts/4_install_jumpserver.sh:43 -msgid "Web access" -msgstr "Web 訪問" - -#: scripts/4_install_jumpserver.sh:50 -msgid "Default username" -msgstr "預設用戶" - -#: scripts/4_install_jumpserver.sh:50 -msgid "Default password" -msgstr "默認密碼" - -#: scripts/4_install_jumpserver.sh:53 -msgid "access" -msgstr "訪問" - -#: scripts/4_install_jumpserver.sh:58 -msgid "More information" -msgstr "更多資訊" - -#: scripts/4_install_jumpserver.sh:59 -msgid "Official Website" -msgstr "我們的官網" - -#: scripts/4_install_jumpserver.sh:60 -msgid "Documentation" -msgstr "我們的文件" - -#: scripts/4_install_jumpserver.sh:70 -msgid "Install and Configure Docker" -msgstr "安裝配置 Docker" - -#: scripts/4_install_jumpserver.sh:79 -msgid "Install and Configure JumpServer" -msgstr "安裝配置 JumpServer" - -#: scripts/5_db_backup.sh:19 -msgid "Backing up" -msgstr "正在備份" - -#: scripts/5_db_backup.sh:51 scripts/5_db_backup.sh:52 -msgid "Backup failed" -msgstr "備份失敗" - -#: scripts/5_db_backup.sh:56 -msgid "Backup succeeded! The backup file has been saved to" -msgstr "備份成功! 備份文件已存放至" - #: jmsctl.sh:16 msgid "If you are upgrading from v1.5.x, please copy the config.txt To" msgstr "如果你是從 v1.5.x 升級的, 請 copy 之前目錄中的 config.txt 到" @@ -606,75 +616,76 @@ msgstr "軟連接存在問題, 重新更新" #: jmsctl.sh:40 msgid "JumpServer Deployment Management Script" -msgstr "umpServer 部署管理腳本" +msgstr "JumpServer 部署管理腳本" #: jmsctl.sh:47 msgid "Install JumpServer" msgstr "安裝 JumpServer" -#: jmsctl.sh:50 -msgid "Configuration Tools" +#: jmsctl.sh:48 +msgid "Upgrade JumpServer" msgstr "升級 JumpServer" #: jmsctl.sh:51 +msgid "Configuration Tools" +msgstr "設定工具" + +#: jmsctl.sh:52 msgid "Start JumpServer" msgstr "啟動 JumpServer" -#: jmsctl.sh:52 +#: jmsctl.sh:53 msgid "Stop JumpServer" msgstr "停止 JumpServer" -#: jmsctl.sh:53 +#: jmsctl.sh:54 msgid "Restart JumpServer" msgstr "重啟 JumpServer" -#: jmsctl.sh:54 +#: jmsctl.sh:55 msgid "Check JumpServer" msgstr "檢查 JumpServer" -#: jmsctl.sh:55 +#: jmsctl.sh:56 msgid "Offline JumpServer" msgstr "下線 JumpServer" -#: jmsctl.sh:59 +#: jmsctl.sh:60 msgid "Loading docker image" msgstr "載入 Docker 鏡像" -#: jmsctl.sh:61 +#: jmsctl.sh:62 msgid "Data recovery through database backup file" msgstr "通過資料庫備份文件恢復數據" -#: jmsctl.sh:62 +#: jmsctl.sh:63 msgid "Execute the original docker compose command" msgstr "執行原始 docker compose 命令" -#: jmsctl.sh:63 +#: jmsctl.sh:64 msgid "View log" msgstr "查看日誌" -#: jmsctl.sh:118 +#: jmsctl.sh:119 msgid "The current version is up to date" msgstr "當前版本已是最新" -#: jmsctl.sh:123 +#: jmsctl.sh:124 msgid "The latest version is" msgstr "最新版本是" -#: jmsctl.sh:127 +#: jmsctl.sh:128 msgid "The current version is" msgstr "當前版本是" -#: jmsctl.sh:172 jmsctl.sh:178 +#: jmsctl.sh:173 jmsctl.sh:179 msgid "Unsupported Operating System Error" msgstr "錯誤: 不支持的操作系統" -#: jmsctl.sh:173 +#: jmsctl.sh:174 msgid "macOS installer please see" msgstr "macOS 安裝請參考" -#: jmsctl.sh:179 +#: jmsctl.sh:180 msgid "Windows installer please see" msgstr "Windows 安裝請參考" - -#~ msgid "Configure MySQL" -#~ msgstr "配置 MySQL" diff --git a/quick_start.sh b/quick_start.sh index 88b4e82b..c9291e82 100644 --- a/quick_start.sh +++ b/quick_start.sh @@ -50,7 +50,6 @@ function get_installer() { function config_installer() { cd /opt/jumpserver-installer-${VERSION} || exit 1 - sed -i "s/VERSION=.*/VERSION=${VERSION}/g" /opt/jumpserver-installer-${VERSION}/static.env ./jmsctl.sh install ./jmsctl.sh start } diff --git a/scripts/7_upgrade.sh b/scripts/7_upgrade.sh index 7ba1b9fa..1e5ea20a 100644 --- a/scripts/7_upgrade.sh +++ b/scripts/7_upgrade.sh @@ -7,6 +7,25 @@ BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" target=$1 +function verify_upgrade_version() { + required_version="v3.10.11" + current_version=$(get_config CURRENT_VERSION) + + if ! [[ $current_version =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then + return + fi + + if [[ -z "${current_version}" ]]; then + log_error "$(gettext 'The current version is not detected, please check')" + exit 1 + fi + + if [ "$(printf '%s\n' "$required_version" "$current_version" | sort -V | head -n1)" != "$required_version" ]; then + log_error "$(gettext 'Your current version does not meet the minimum requirements. Please upgrade to') ${required_version}" + exit 1 + fi +} + function check_and_set_config() { local config_key=$1 local default_value=$2 @@ -31,15 +50,15 @@ function upgrade_config() { docker rm ${container} &>/dev/null fi done - local images=("jumpserver/mariadb:10.6" "jumpserver/mysql:5.7") - for image in "${images[@]}"; do - if docker image inspect -f '{{.Id}}' ${image} &>/dev/null; then - docker tag ${image} ${image#*/} - fi - done if docker ps -a | grep jms_xpack &>/dev/null; then docker volume rm jms_share-volume &>/dev/null fi + if docker image inspect -f '{{.Id}}' jumpserver/mariadb:10.6 &>/dev/null; then + docker tag jumpserver/mariadb:10.6 mariadb:10.6 + fi + if docker image inspect -f '{{.Id}}' jumpserver/mysql:5.7 &>/dev/null; then + docker tag jumpserver/mysql:5.7 mysql:5.7-debian + fi check_and_set_config "CURRENT_VERSION" "${VERSION}" check_and_set_config "CLIENT_MAX_BODY_SIZE" "4096m" check_and_set_config "SERVER_HOSTNAME" "${HOSTNAME}" @@ -267,6 +286,7 @@ function main() { export VERSION=${to_version} fi echo + verify_upgrade_version update_config_if_need echo check_compose_install diff --git a/scripts/utils.sh b/scripts/utils.sh index aa4a510f..e810597b 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -108,29 +108,46 @@ function disable_config() { } function check_db_data() { - db_type=$1 - if [[ ! -f "${CONFIG_FILE}" ]]; then - return - fi - volume_dir=$(get_config VOLUME_DIR) - db_name=$(get_config DB_NAME) - if [[ -d "${volume_dir}/${db_type}/data/${db_name}" ]]; then - echo "1" - fi + db_type=$1 + if [[ ! -f "${CONFIG_FILE}" ]]; then + return + fi + volume_dir=$(get_config VOLUME_DIR) + if [[ -d "${volume_dir}/${db_type}/data" ]]; then + echo "1" + else + echo "0" + fi } function get_db_info() { info_type=$1 - mysql_data_exists=$(check_db_data "mysql") - mariadb_data_exists=$(check_db_data "mariadb") + db_engine=$(get_config DB_ENGINE "mysql") + db_host=$(get_config DB_HOST) + + mysql_data_exists="0" + mariadb_data_exists="0" + postgres_data_exists="0" + + case "${db_engine}" in + "mysql") + if [[ "${db_host}" == "mysql" ]]; then + mysql_data_exists=$(check_db_data "mysql") + fi + mariadb_data_exists="1" + ;; + "postgresql") + postgres_data_exists="1" + ;; + esac case "${info_type}" in "image") if [[ "${mysql_data_exists}" == "1" ]]; then - echo "mysql:5.7" + echo "mysql:5.7-debian" elif [[ "${mariadb_data_exists}" == "1" ]]; then echo "mariadb:10.6" - else + elif [[ "${postgres_data_exists}" == "1" ]]; then echo "postgres:16.3-bullseye" fi ;; @@ -139,7 +156,7 @@ function get_db_info() { echo "compose/mysql.yml" elif [[ "${mariadb_data_exists}" == "1" ]]; then echo "compose/mariadb.yml" - else + elif [[ "${postgres_data_exists}" == "1" ]]; then echo "compose/postgres.yml" fi ;; @@ -593,61 +610,60 @@ function get_current_version() { function pull_image() { image=$1 DOCKER_IMAGE_MIRROR=$(get_config_or_env 'DOCKER_IMAGE_MIRROR') + IMAGE_PULL_POLICY=$(get_config_or_env 'IMAGE_PULL_POLICY') + if [[ "${DOCKER_IMAGE_MIRROR}" == "1" ]]; then - if [[ "$(uname -m)" == "x86_64" ]]; then - DOCKER_IMAGE_PREFIX="swr.cn-north-1.myhuaweicloud.com" - fi - if [[ "$(uname -m)" == "aarch64" ]]; then - DOCKER_IMAGE_PREFIX="swr.cn-north-4.myhuaweicloud.com" - fi - if [[ "$(uname -m)" == "loongarch64" ]]; then - DOCKER_IMAGE_PREFIX="swr.cn-southwest-2.myhuaweicloud.com" - fi - if [[ "$(uname -m)" == "s390x" ]]; then - DOCKER_IMAGE_PREFIX="swr.sa-brazil-1.myhuaweicloud.com" - fi + case "$(uname -m)" in + "x86_64") + DOCKER_IMAGE_PREFIX="swr.cn-north-1.myhuaweicloud.com" + ;; + "aarch64") + DOCKER_IMAGE_PREFIX="swr.cn-north-4.myhuaweicloud.com" + ;; + "loongarch64") + DOCKER_IMAGE_PREFIX="swr.cn-southwest-2.myhuaweicloud.com" + ;; + "s390x") + DOCKER_IMAGE_PREFIX="swr.sa-brazil-1.myhuaweicloud.com" + ;; + esac else DOCKER_IMAGE_PREFIX=$(get_config_or_env 'DOCKER_IMAGE_PREFIX') fi - IMAGE_PULL_POLICY=$(get_config_or_env 'IMAGE_PULL_POLICY') - if docker image inspect -f '{{ .Id }}' "$image" &>/dev/null; then - exits=0 + exists=0 else - exits=1 + exists=1 fi - if [[ "$exits" == "0" && "$IMAGE_PULL_POLICY" != "Always" ]]; then + if [[ "$exists" == "0" && "$IMAGE_PULL_POLICY" != "Always" ]]; then echo "[${image}] exist, pass" return fi pull_args="" - if [[ -n "${BUILD_ARCH}" ]]; then - case "${BUILD_ARCH}" in - "x86_64") - pull_args="--platform linux/amd64" - ;; - "aarch64") - pull_args="--platform linux/arm64" - ;; - "loongarch64") - pull_args="--platform linux/loong64" - ;; - "s390x") - pull_args="--platform linux/s390x" - ;; - esac - fi + case "${BUILD_ARCH}" in + "x86_64") pull_args="--platform linux/amd64" ;; + "aarch64") pull_args="--platform linux/arm64" ;; + "loongarch64") pull_args="--platform linux/loong64" ;; + "s390x") pull_args="--platform linux/s390x" ;; + esac echo "[${image}] pulling" - if [[ -n "${DOCKER_IMAGE_PREFIX}" && $(image_has_prefix "${image}") == "1" ]]; then - docker pull ${pull_args} "${DOCKER_IMAGE_PREFIX}/${image}" - docker tag "${DOCKER_IMAGE_PREFIX}/${image}" "${image}" - docker rmi -f "${DOCKER_IMAGE_PREFIX}/${image}" - else - docker pull ${pull_args} "${image}" + full_image_path="${image}" + if [[ -n "${DOCKER_IMAGE_PREFIX}" ]]; then + if [[ $(image_has_prefix "${image}") != "1" ]]; then + full_image_path="${DOCKER_IMAGE_PREFIX}/jumpserver/${image}" + else + full_image_path="${DOCKER_IMAGE_PREFIX}/${image}" + fi + fi + + docker pull ${pull_args} "${full_image_path}" + if [[ "${full_image_path}" != "${image}" ]]; then + docker tag "${full_image_path}" "${image}" + docker rmi -f "${full_image_path}" fi echo "" }