From 8e03a7df608acd5a6c8d6989734618c381fc3a0f Mon Sep 17 00:00:00 2001
From: marsal wang <707783088@qq.com>
Date: Mon, 27 Dec 2021 14:38:06 +0800
Subject: [PATCH] kinbana basepath

---
 README.md                        |  2 +-
 builder-docker/nodejs/Dockerfile | 32 ++++++++++++++++++++++++++++++++
 elasticsearch/values.yaml        |  4 ++++
 local-values/es/crm1.yaml        |  4 ++++
 4 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 builder-docker/nodejs/Dockerfile

diff --git a/README.md b/README.md
index 1a6aeac..af9291e 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ helm upgrade -i  jenkins jenkins/ --values local-values/jenkins/values.yaml -n j
 https://hub.fastgit.org/nacos-group/nacos-k8s.git
 
 ```
-helm upgrade -i  nacos-crm1 nacos/ --values local-values/nacos/crm1-values.yaml -n crm1
+helm upgrade -i  nacos nacos/ --values local-values/nacos/crm1-values.yaml -n crm1
 
 ```
 
diff --git a/builder-docker/nodejs/Dockerfile b/builder-docker/nodejs/Dockerfile
new file mode 100644
index 0000000..444f95c
--- /dev/null
+++ b/builder-docker/nodejs/Dockerfile
@@ -0,0 +1,32 @@
+FROM kubespheredev/builder-base
+
+ENV NODE_VERSION 12.22.8
+
+RUN yum -y install gcc-c++ && yum  -y groupinstall 'Development Tools'
+
+RUN wget -q -O -  https://nodejs.org/dist/v12.22.8/node-v12.22.8-linux-x64.tar.gz \
+    | tar --strip-components=1 -xzf - -C /usr/local \
+    && rm -rf node-v12.22.8-linux-x64.tar.gz \
+    && node -v && npm -v
+
+RUN npm install -g yarn \
+    && yarn config set registry https://mirrors.huaweicloud.com/repository/npm/ \
+    && yarn config set disturl https://mirrors.huaweicloud.com/nodejs/ \
+    && yarn config set electron_mirror https://mirrors.huaweicloud.com/electron/ \
+    && yarn config set registry https://registry.npm.taobao.org \
+    && yarn config set disturl https://npm.taobao.org/dist \
+    && yarn config set electron_mirror https://npm.taobao.org/mirrors/electron/ \
+	&& yarn config set cache-folder /root/.yarn
+
+# RUN wget https://www.python.org/ftp/python/3.6.8/Python-3.6.8.tar.xz \
+#     && xz -d Python-3.6.8.tar.xz && tar -xf Python-3.6.8.tar \
+#     && cd Python-3.6.8  && ./configure prefix=/usr/local/python3 \
+#     && make && make install \
+#     && yum install -y zlib zlib-devel \
+#     && rm -rf /usr/bin/python && ln -s /usr/local/python3/bin/python3.6 /usr/bin/python \
+#     && python -V
+
+
+CMD ["yarn","version"]
+
+#docker build -f Dockerfile -t marsal1212/builder-nodejs:latest .
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index bf3963d..03b5eda 100644
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -1781,3 +1781,7 @@ kibana:
     hosts:
       - '{{ include "elasticsearch.coordinating.fullname" . }}'
     port: 9200
+  configuration:
+    server:
+      basePath: "kibana"
+      rewriteBasePath: false
\ No newline at end of file
diff --git a/local-values/es/crm1.yaml b/local-values/es/crm1.yaml
index e59da94..5908be7 100644
--- a/local-values/es/crm1.yaml
+++ b/local-values/es/crm1.yaml
@@ -1781,3 +1781,7 @@ kibana:
     hosts:
       - '{{ include "elasticsearch.coordinating.fullname" . }}'
     port: 9200
+  configuration:
+    server:
+      basePath: "kibana"
+      rewriteBasePath: false
\ No newline at end of file