diff --git a/Dockerfile b/Dockerfile index 497f0cc..333262b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ FROM nginx:1.17.1 -COPY docker/entrypoint.sh /entrypoint.sh RUN rm -f /etc/nginx/nginx.conf \ && rm -f /etc/nginx/conf.d/default.conf COPY docker/nginx.80.conf /etc/nginx/conf.d/nginx.80.conf diff --git a/build.sh b/build.sh index d1070ca..454af35 100755 --- a/build.sh +++ b/build.sh @@ -6,11 +6,14 @@ tag=eipwork/kuboard-press npm install --registry=https://registry.npm.taobao.org npm run docs:build -# docker build -t $tag:latest . +yarn install +yarn docs:build + +docker build -t $tag:latest . -# if test $datetime != ""; then -# # docker push $tag:latest -# docker tag $tag:latest $tag:$datetime -# docker push $tag:$datetime -# fi +if test $datetime != ""; then + # docker push $tag:latest + docker tag $tag:latest $tag:$datetime + docker push $tag:$datetime +fi diff --git a/docker/dnsmasq.conf b/docker/dnsmasq.conf deleted file mode 100644 index 5202c67..0000000 --- a/docker/dnsmasq.conf +++ /dev/null @@ -1 +0,0 @@ -user=root diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh deleted file mode 100755 index 67fc82e..0000000 --- a/docker/entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -echo "start dnsmasq" -service dnsmasq start -echo ${KUBERNETES_SERVICE_HOST}:${KUBERNETES_SERVICE_PORT_HTTPS} -sed -i s/KUBERNETES_SERVICE_HOST/${KUBERNETES_SERVICE_HOST}/g /etc/nginx/conf.d/nginx.80.conf -sed -i s/KUBERNETES_SERVICE_PORT_HTTPS/${KUBERNETES_SERVICE_PORT_HTTPS}/g /etc/nginx/conf.d/nginx.80.conf -echo "start nginx" -nginx -g "daemon off;" \ No newline at end of file diff --git a/docker/nginx.80.conf b/docker/nginx.80.conf index fb76305..1f98c7e 100644 --- a/docker/nginx.80.conf +++ b/docker/nginx.80.conf @@ -4,6 +4,7 @@ server { location / { root /usr/share/nginx/html; index landing.html index.html index.htm; + expires 1d; } error_page 404 500 502 503 504 /404.html; diff --git a/support/change-log/v1.0.x.md b/support/change-log/v1.0.x.md index 5b5de72..d2e954a 100644 --- a/support/change-log/v1.0.x.md +++ b/support/change-log/v1.0.x.md @@ -23,7 +23,7 @@ v1.0.8.1 **优化** * 编辑 Annotation 的取值时可以换行; -* 调整 watcher 的长连接时间为 5 秒,以便在用户使用了反向代理的情况下,获得更及时的事件反馈信息; +* 将 watcher 的长连接时间从 60秒 调整为 5 秒,以便在用户使用了反向代理的情况下,获得更及时的事件反馈信息; **BUG修正**