You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ta...@apache.org on 2019/12/14 09:35:31 UTC
[skywalking] branch JaredTan95-patch-1 created (now f0fcfad)
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a change to branch JaredTan95-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at f0fcfad fix docker-entrypoint.sh generate error.
This branch includes the following new commits:
new f0fcfad fix docker-entrypoint.sh generate error.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/01: fix docker-entrypoint.sh generate error.
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a commit to branch JaredTan95-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit f0fcfad1ae6d585e4c07fe63f5aa718fd6831d92
Author: Jared Tan <ji...@daocloud.io>
AuthorDate: Sat Dec 14 17:35:23 2019 +0800
fix docker-entrypoint.sh generate error.
fix docker-entrypoint.sh generate error in generateStorageMySQL() method.
---
docker/oap/docker-entrypoint.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/docker/oap/docker-entrypoint.sh b/docker/oap/docker-entrypoint.sh
index c18cd1a..67d75c0 100755
--- a/docker/oap/docker-entrypoint.sh
+++ b/docker/oap/docker-entrypoint.sh
@@ -138,13 +138,13 @@ generateStorageMySQL() {
storage:
mysql:
properties:
- jdbcUrl: ${SW_JDBC_URL:"jdbc:mysql://localhost:3306/swtest"}
- dataSource.user: ${SW_DATA_SOURCE_USER:root}
- dataSource.password: ${SW_DATA_SOURCE_PASSWORD:root@1234}
- dataSource.cachePrepStmts: ${SW_DATA_SOURCE_CACHE_PREP_STMTS:true}
- dataSource.prepStmtCacheSize: ${SW_DATA_SOURCE_PREP_STMT_CACHE_SQL_SIZE:250}
- dataSource.prepStmtCacheSqlLimit: ${SW_DATA_SOURCE_PREP_STMT_CACHE_SQL_LIMIT:2048}
- dataSource.useServerPrepStmts: ${SW_DATA_SOURCE_USE_SERVER_PREP_STMTS:true}
+ jdbcUrl: \${SW_JDBC_URL:"jdbc:mysql://localhost:3306/swtest"}
+ dataSource.user: \${SW_DATA_SOURCE_USER:root}
+ dataSource.password: \${SW_DATA_SOURCE_PASSWORD:root@1234}
+ dataSource.cachePrepStmts: \${SW_DATA_SOURCE_CACHE_PREP_STMTS:true}
+ dataSource.prepStmtCacheSize: \${SW_DATA_SOURCE_PREP_STMT_CACHE_SQL_SIZE:250}
+ dataSource.prepStmtCacheSqlLimit: \${SW_DATA_SOURCE_PREP_STMT_CACHE_SQL_LIMIT:2048}
+ dataSource.useServerPrepStmts: \${SW_DATA_SOURCE_USE_SERVER_PREP_STMTS:true}
metadataQueryMaxSize: \${SW_STORAGE_MYSQL_QUERY_MAX_SIZE:5000}
EOT
}