You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2023/05/29 02:13:09 UTC
[linkis] branch dev-1.4.0-integration-test updated: update make-linkis-image-with-mysql-jdbc.sh
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.4.0-integration-test
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.4.0-integration-test by this push:
new d8a944816 update make-linkis-image-with-mysql-jdbc.sh
d8a944816 is described below
commit d8a9448163d68848e33fd33c66780c769292b8a1
Author: casionone <ca...@gmail.com>
AuthorDate: Mon May 29 10:12:52 2023 +0800
update make-linkis-image-with-mysql-jdbc.sh
---
.github/workflows/integration-test2.yml | 10 +++++++++-
README.md | 2 +-
README_CN.md | 2 +-
linkis-dist/bin/install-linkis-to-kubernetes.sh | 6 +++---
...with-mysql-jdbc.sh => make-linkis-image-with-mysql-jdbc.sh} | 0
linkis-dist/helm/README.md | 6 +++---
linkis-dist/helm/README_CN.md | 6 +++---
7 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/integration-test2.yml b/.github/workflows/integration-test2.yml
index 7d5432f0d..fca149e31 100644
--- a/.github/workflows/integration-test2.yml
+++ b/.github/workflows/integration-test2.yml
@@ -96,15 +96,21 @@ jobs:
cluster_name: ${{ env.KIND_CLUSTER_NAME }}
- name: Start Linkis Service
run: |
+ #先直接下载镜像 后续调整为主动构建
ROOT_DIR=./linkis-dist/
MIRRORS="ghcr.io"
TAG="latest"
docker pull ${MIRRORS}/apache/linkis/linkis-ldh:${TAG}
docker pull ${MIRRORS}/apache/linkis/linkis:${TAG}
docker pull ${MIRRORS}/apache/linkis/linkis-web:${TAG}
- docker tag ${MIRRORS}/apache/linkis/linkis:${TAG} linkis:dev
+ #添加mysql 驱动
+ ${ROOT_DIR}/docker/scripts/make-linkis-image-with-mysql-jdbc.sh
+ #重新打tag
+ docker tag linkis:with-jdbc linkis:dev
+ #docker tag ${MIRRORS}/apache/linkis/linkis:${TAG} linkis:dev
docker tag ${MIRRORS}/apache/linkis/linkis-web:${TAG} linkis-web:dev
docker tag ${MIRRORS}/apache/linkis/linkis-ldh:${TAG} linkis-ldh:dev
+ #启动容器服务
bash ./linkis-dist/helm/scripts/install-mysql.sh true\
&& bash ./linkis-dist/helm/scripts/install-ldh.sh true \
&& bash ./linkis-dist/helm/scripts/install-charts-with-ldh.sh linkis linkis-demo true
@@ -116,8 +122,10 @@ jobs:
n=$((n+1))
sleep 10
done
+ #打印日志
bash ./linkis-dist/helm/scripts/logs-pod.sh cg-linkismanager
bash ./linkis-dist/helm/scripts/logs-pod.sh cg-engineconnmanager
+ #临时使用client lib包 后续主动构建后需要调整
echo "cp -r linkis-dist/package/lib1 linkis-dist/package/lib"
cp -r linkis-dist/package/lib1 linkis-dist/package/lib
# 开启proxy 端口映射
diff --git a/README.md b/README.md
index c6dea6c11..42a8a4f79 100644
--- a/README.md
+++ b/README.md
@@ -154,7 +154,7 @@ linkis image by yourself, the image created by this tool will be tagged as `link
```shell
$> LINKIS_IMAGE=linkis:1.3.1
-$> ./linkis-dist/docker/scripts/make-linikis-image-with-mysql-jdbc.sh
+$> ./linkis-dist/docker/scripts/make-linkis-image-with-mysql-jdbc.sh
```
diff --git a/README_CN.md b/README_CN.md
index 3a3aa6708..aaba2e027 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -143,7 +143,7 @@ npm run build
```shell
$> LINKIS_IMAGE=linkis:1.3.1
-$> ./linkis-dist/docker/scripts/make-linikis-image-with-mysql-jdbc.sh
+$> ./linkis-dist/docker/scripts/make-linkis-image-with-mysql-jdbc.sh
```
请参考[快速安装部署 ](https://linkis.apache.org/zh-CN/docs/latest/deployment/deploy-quick/) 来部署 Linkis
diff --git a/linkis-dist/bin/install-linkis-to-kubernetes.sh b/linkis-dist/bin/install-linkis-to-kubernetes.sh
index 1bdb1e36e..44e84e989 100644
--- a/linkis-dist/bin/install-linkis-to-kubernetes.sh
+++ b/linkis-dist/bin/install-linkis-to-kubernetes.sh
@@ -83,8 +83,8 @@ tag(){
fi
}
#create an image to carry mysql
-make_linikis_image_with_mysql_jdbc(){
- ${ROOT_DIR}/docker/scripts/make-linikis-image-with-mysql-jdbc.sh
+make_linkis_image_with_mysql_jdbc(){
+ ${ROOT_DIR}/docker/scripts/make-linkis-image-with-mysql-jdbc.sh
docker tag linkis:with-jdbc linkis:dev
}
#creating a kind cluster
@@ -117,7 +117,7 @@ display_pods(){
install(){
if [ $USING_KIND = true ]; then
tag
- make_linikis_image_with_mysql_jdbc
+ make_linkis_image_with_mysql_jdbc
create_kind_cluster
fi
install_mysql
diff --git a/linkis-dist/docker/scripts/make-linikis-image-with-mysql-jdbc.sh b/linkis-dist/docker/scripts/make-linkis-image-with-mysql-jdbc.sh
old mode 100755
new mode 100644
similarity index 100%
rename from linkis-dist/docker/scripts/make-linikis-image-with-mysql-jdbc.sh
rename to linkis-dist/docker/scripts/make-linkis-image-with-mysql-jdbc.sh
diff --git a/linkis-dist/helm/README.md b/linkis-dist/helm/README.md
index 81e076cb9..2dfaec11b 100644
--- a/linkis-dist/helm/README.md
+++ b/linkis-dist/helm/README.md
@@ -255,14 +255,14 @@ No rows affected (1.306 seconds)
No rows affected (0.046 seconds)
0: jdbc:hive2://ldh.ldh.svc.cluster.local:100> create table t1 (id int, data string);
No rows affected (0.709 seconds)
-0: jdbc:hive2://ldh.ldh.svc.cluster.local:100> insert into t1 values(1, 'linikis demo');
+0: jdbc:hive2://ldh.ldh.svc.cluster.local:100> insert into t1 values(1, 'linkis demo');
WARNING: Hive-on-MR is deprecated in Hive 2 and may not be available in the future versions. Consider using a different execution engine (i.e. spark, tez) or using Hive 1.X releases.
No rows affected (5.491 seconds)
0: jdbc:hive2://ldh.ldh.svc.cluster.local:100> select * from t1;
+--------+---------------+
| t1.id | t1.data |
+--------+---------------+
-| 1 | linikis demo |
+| 1 | linkis demo |
+--------+---------------+
1 row selected (0.39 seconds)
0: jdbc:hive2://ldh.ldh.svc.cluster.local:100> !q
@@ -288,7 +288,7 @@ Time taken: 0.074 seconds
22/07/31 02:58:02 INFO thriftserver.SparkSQLCLIDriver: Time taken: 0.074 seconds
spark-sql> select * from t1;
...
-1 linikis demo
+1 linkis demo
2 linkis demo spark sql
Time taken: 3.352 seconds, Fetched 2 row(s)
spark-sql> quit;
diff --git a/linkis-dist/helm/README_CN.md b/linkis-dist/helm/README_CN.md
index bbac5c2b8..743410125 100644
--- a/linkis-dist/helm/README_CN.md
+++ b/linkis-dist/helm/README_CN.md
@@ -246,14 +246,14 @@ No rows affected (1.306 seconds)
No rows affected (0.046 seconds)
0: jdbc:hive2://ldh.ldh.svc.cluster.local:100> create table t1 (id int, data string);
No rows affected (0.709 seconds)
-0: jdbc:hive2://ldh.ldh.svc.cluster.local:100> insert into t1 values(1, 'linikis demo');
+0: jdbc:hive2://ldh.ldh.svc.cluster.local:100> insert into t1 values(1, 'linkis demo');
WARNING: Hive-on-MR is deprecated in Hive 2 and may not be available in the future versions. Consider using a different execution engine (i.e. spark, tez) or using Hive 1.X releases.
No rows affected (5.491 seconds)
0: jdbc:hive2://ldh.ldh.svc.cluster.local:100> select * from t1;
+--------+---------------+
| t1.id | t1.data |
+--------+---------------+
-| 1 | linikis demo |
+| 1 | linkis demo |
+--------+---------------+
1 row selected (0.39 seconds)
0: jdbc:hive2://ldh.ldh.svc.cluster.local:100> !q
@@ -279,7 +279,7 @@ Time taken: 0.074 seconds
22/07/31 02:58:02 INFO thriftserver.SparkSQLCLIDriver: Time taken: 0.074 seconds
spark-sql> select * from t1;
...
-1 linikis demo
+1 linkis demo
2 linkis demo spark sql
Time taken: 3.352 seconds, Fetched 2 row(s)
spark-sql> quit;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org