feat: add git cherry

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
pull/825/head
Xinwei Xiong(cubxxw-openim) 2 years ago
parent b34f667a5f
commit e13f7ebfe3
No known key found for this signature in database
GPG Key ID: 1BAD6F395338EFDE

@ -28,9 +28,9 @@ readonly USER=${USER:-'root'} # Setting a username
# 设置统一的密码,方便记忆
readonly PASSWORD=${PASSWORD:-'openIM123'} # Setting a password
# Linux系统 going 用户
readonly LINUX_USERNAME=${LINUX_USERNAME:-going}
# Linux root & going 用户密码
# Linux系统 openim 用户
readonly LINUX_USERNAME=${LINUX_USERNAME:-openim}
# Linux root & openim 用户密码
readonly LINUX_PASSWORD=${LINUX_PASSWORD:-${PASSWORD}}
# 设置安装目录

@ -21,10 +21,6 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source $SCRIPTS_ROOT/lib/init.sh
source $SCRIPTS_ROOT/path_info.sh
echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}"
echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}"
echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"
bin_dir="$BIN_DIR"
logs_dir="$OPENIM_ROOT/logs"

@ -25,10 +25,6 @@ source $SCRIPTS_ROOT/path_info.sh
cd $SCRIPTS_ROOT
echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}"
echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}"
echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"
bin_dir="$BIN_DIR"
logs_dir="$OPENIM_ROOT/logs"

@ -75,7 +75,6 @@ readonly OPENIM_SUPPORTED_SERVER_PLATFORMS=(
)
# If we update this we should also update the set of platforms whose standard
# library is precompiled for in build/image/cross/Dockerfile
readonly OPENIM_SUPPORTED_CLIENT_PLATFORMS=(
linux/amd64
linux/arm64
@ -83,6 +82,7 @@ readonly OPENIM_SUPPORTED_CLIENT_PLATFORMS=(
# The set of server targets that we are only building for Linux
# If you update this list, please also update build/BUILD.
# TODO: Label
openim::golang::server_targets() {
local targets=(
openim-api

Loading…
Cancel
Save