diff --git a/tools/docker/standalone/Dockerfile b/tools/docker/standalone/Dockerfile index 45d449c599dbb55695699a6feec923031de4b66c..3fc92da7c32881015c26ae73ed0cf4a4aaebf2c9 100644 --- a/tools/docker/standalone/Dockerfile +++ b/tools/docker/standalone/Dockerfile @@ -1,10 +1,10 @@ FROM oceanbase/centos7:latest RUN yum-config-manager --add-repo https://mirrors.aliyun.com/oceanbase/OceanBase.repo && \ - yum install -y ob-deploy obclient ob-sysbench wget libaio && \ + yum install -y ob-deploy-1.2.1 obclient ob-sysbench wget libaio && \ mkdir /root/pkg && \ cd /root/pkg && \ - wget https://mirrors.aliyun.com/oceanbase/community/stable/el/7/x86_64/oceanbase-ce-3.1.2-10000392021123010.el7.x86_64.rpm -q && \ - wget https://mirrors.aliyun.com/oceanbase/community/stable/el/7/x86_64/oceanbase-ce-libs-3.1.2-10000392021123010.el7.x86_64.rpm -q && \ + wget https://mirrors.aliyun.com/oceanbase/community/stable/el/7/x86_64/oceanbase-ce-3.1.3-10000292022032916.el7.x86_64.rpm -q && \ + wget https://mirrors.aliyun.com/oceanbase/community/stable/el/7/x86_64/oceanbase-ce-libs-3.1.3-10000292022032916.el7.x86_64.rpm -q && \ rm -rf /usr/obd/mirror/remote/* && \ obd mirror clone *.rpm && \ obd mirror list local && \ diff --git a/tools/docker/standalone/boot/_boot b/tools/docker/standalone/boot/_boot index 3402c3ed934d3fd93df6fd5cb2577f8f87de5763..dcea2a7ff6a522da07fcf26648c1977c38900e54 100755 --- a/tools/docker/standalone/boot/_boot +++ b/tools/docker/standalone/boot/_boot @@ -5,32 +5,49 @@ source _env STAMP="$(date +%s)" +# return 0 if mini_mode is nil or 'no'/'false'/0 +# 0 means true and 1 for false in bash +function is_mini_mode() { + if test -z ${MINI_MODE} + then + return 1 + fi + + # convert MINI_MODE to upper case string(can work in bash 4.x) + mini_mode=${MINI_MODE^^} + if [ "x${mini_mode}" == "xNO" ] || [ "x${mini_mode}" == "xFALSE" ] || [ "x${mini_mode}" == "x0" ]; then + return 1 + fi + return 0 +} + [[ -f boot.yaml ]] && echo "find boot.yaml, skip configuring..." || { echo "generate boot.yaml ..." TMPFILE="boot.${STAMP}.yaml" - if [[ $MINI_MODE == 1 ]] + + if is_mini_mode then - cp -f boot-mini-tmp.yaml $TMPFILE + echo "oceanbase-ce docker in mini mode" + cp -f boot-mini-tmp.yaml $TMPFILE else - cp -f boot-tmp.yaml $TMPFILE + cp -f boot-tmp.yaml $TMPFILE fi + sed -i "s|@OB_HOME_PATH@|${OB_HOME_PATH}|g" $TMPFILE sed -i "s|@OB_MYSQL_PORT@|${OB_MYSQL_PORT}|g" $TMPFILE sed -i "s|@OB_RPC_PORT@|${OB_RPC_PORT}|g" $TMPFILE sed -i "s|@OB_ROOT_PASSWORD@|${OB_ROOT_PASSWORD}|g" $TMPFILE + [ "${OB_DATA_DIR}" ] && echo " data_dir: ${OB_DATA_DIR}" >> $TMPFILE [ "${OB_REDO_DIR}" ] && echo " redo_dir: ${OB_REDO_DIR}" >> $TMPFILE echo "create boot dirs and deploy ob cluster ..." mkdir -p $OB_HOME_PATH - if [[ $MINI_MODE == 1 ]] - then - obd cluster deploy "${OB_CLUSTER_NAME}" -c $TMPFILE && obd cluster tenant create "${OB_CLUSTER_NAME}" -n ${OB_TENANT_NAME} && obd cluster start "${OB_CLUSTER_NAME}" && obclient -h127.1 -uroot@${OB_TENANT_NAME} -A -P${OB_MYSQL_PORT} < init_tenant_user.sql && mv -f $TMPFILE boot.yaml - else - obd cluster autodeploy "${OB_CLUSTER_NAME}" -c $TMPFILE && obd cluster tenant create "${OB_CLUSTER_NAME}" -n ${OB_TENANT_NAME} && obclient -h127.1 -uroot@${OB_TENANT_NAME} -A -P${OB_MYSQL_PORT} < init_tenant_user.sql && mv -f $TMPFILE boot.yaml - fi -} -[[ -f boot.yaml ]] && { - echo "start ob cluster ..." - obd cluster start $OB_CLUSTER_NAME -} && echo "boot success!" && exec /sbin/init + obd cluster autodeploy "${OB_CLUSTER_NAME}" -c $TMPFILE \ + && obd cluster tenant create "${OB_CLUSTER_NAME}" -n ${OB_TENANT_NAME} \ + && obclient -h127.1 -uroot@${OB_TENANT_NAME} -A -P${OB_MYSQL_PORT} < init_tenant_user.sql \ + && mv -f $TMPFILE boot.yaml \ + && echo "start ob cluster ..." \ + && echo "boot success!" \ + && exec /sbin/init +} diff --git a/tools/docker/standalone/boot/boot-tmp.yaml b/tools/docker/standalone/boot/boot-tmp.yaml index 86d834c64c397efba65ab9a116d50c7489d6ae6a..d4357180877e3e3cb8960e5dfbf34484f1bf2adf 100644 --- a/tools/docker/standalone/boot/boot-tmp.yaml +++ b/tools/docker/standalone/boot/boot-tmp.yaml @@ -7,3 +7,5 @@ oceanbase-ce: mysql_port: @OB_MYSQL_PORT@ # default: 2881 rpc_port: @OB_RPC_PORT@ # default: 2882 root_password: @OB_ROOT_PASSWORD@ # default: null + datafile_size: 10G + clog_disk_usage_limit_percentage: 98 # default: 80