center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #6463 from dataease/pr@dev_v2_modify_version

Browse Source 
chore: 调整镜像名称
This commit is contained in:
fit2cloudrd 2023-11-01 10:12:48 +08:00 committed by GitHub
commit 9519f521ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
installer/dataease/docker-compose-apisix.yml
View File

@ -2,7 +2,7 @@ version: "3"
services: services:
apisix-dashboard: apisix-dashboard:
image: apache/apisix-dashboard:3.0.1-alpine image: registry.cn-qingdao.aliyuncs.com/dataease/apisix-dashboard:3.0.1-alpine
container_name: apisix-dashboard container_name: apisix-dashboard
restart: always restart: always
volumes: volumes:
@ -13,7 +13,7 @@ services:
dataease-network: dataease-network:
apisix: apisix:
image: apache/apisix:3.4.1-debian image: registry.cn-qingdao.aliyuncs.com/dataease/apisix:3.6.0-debian
container_name: apisix container_name: apisix
environment: environment:
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
@ -33,7 +33,7 @@ services:
dataease-network: dataease-network:
etcd: etcd:
image: bitnami/etcd:3.4.15 image: registry.cn-qingdao.aliyuncs.com/dataease/etcd:3.5.10
container_name: apisix-etcd container_name: apisix-etcd
restart: always restart: always
volumes: volumes:

2
installer/dataease/docker-compose-mysql.yml
View File

@ -2,7 +2,7 @@ version: '2.1'
services: services:
DE_MYSQL_HOST: DE_MYSQL_HOST:
image: mysql:8.1.0 image: registry.cn-qingdao.aliyuncs.com/dataease/mysql:8.1.0
container_name: ${DE_MYSQL_HOST} container_name: ${DE_MYSQL_HOST}
healthcheck: healthcheck:
test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "-u${DE_MYSQL_USER}", "-p${DE_MYSQL_PASSWORD}", "--protocol","tcp"] test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "-u${DE_MYSQL_USER}", "-p${DE_MYSQL_PASSWORD}", "--protocol","tcp"]

2
installer/dataease/docker-compose.yml
View File

@ -2,7 +2,7 @@ version: '2.1'
services: services:
dataease: dataease:
image: registry.cn-qingdao.aliyuncs.com/dataease/dataease2.0:DE_TAG image: registry.cn-qingdao.aliyuncs.com/dataease/dataease:DE_TAG
container_name: dataease container_name: dataease
ports: ports:
- ${DE_PORT}:8100 - ${DE_PORT}:8100

2
installer/dectl
View File

@ -83,7 +83,7 @@ function _healthcheck() {
echo echo
} }
function _get_current_version() { function _get_current_version() {
de_current_version=$(grep "^ image:.*dataease2.0:" ${DE_RUNNING_BASE}/docker-compose.yml | awk -F'dataease2.0:' '{print $2}') de_current_version=$(grep "^ image:.*dataease:" ${DE_RUNNING_BASE}/docker-compose.yml | awk -F'dataease:' '{print $2}')
echo $de_current_version echo $de_current_version
} }
function status() { function status() {

1
installer/install.sh
View File

@ -258,5 +258,4 @@ if [[ $http_code != 200 ]];then
fi fi
echo -e "======================= 安装完成 =======================\n" 2>&1 | tee -a ${CURRENT_DIR}/install.log echo -e "======================= 安装完成 =======================\n" 2>&1 | tee -a ${CURRENT_DIR}/install.log
echo -e "请通过以下方式访问:\n URL: http://\$LOCAL_IP:$DE_PORT\n 用户名: admin\n 初始密码: dataease" 2>&1 | tee -a ${CURRENT_DIR}/install.log