Merge upstream commit

Dockerfile

@@ -7,15 +7,17 @@ RUN cd cmd/dashboard && go build -o app -ldflags="-s -w"
 
 FROM alpine:latest
 ENV TZ="Asia/Shanghai"
+COPY ./script/entrypoint.sh /entrypoint.sh
 RUN apk --no-cache --no-progress add \
     ca-certificates \
     tzdata && \
     cp "/usr/share/zoneinfo/$TZ" /etc/localtime && \
-    echo "$TZ" >  /etc/timezone
+    echo "$TZ" >  /etc/timezone && \
+    chmod +x /entrypoint.sh
 WORKDIR /dashboard
 COPY ./resource ./resource
 COPY --from=binarybuilder /dashboard/cmd/dashboard/app ./app
 
 VOLUME ["/dashboard/data"]
 EXPOSE 80 5555
-CMD ["/dashboard/app"]
+ENTRYPOINT ["/entrypoint.sh"]

README.md

@@ -4,7 +4,7 @@
   <br>
   <small><i>LOGO designed by <a href="https://xio.ng" target="_blank">熊大</a> .</i></small>
   <br><br>
-<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=Dash%20v0.13.13&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.10.2-brightgreen?style=for-the-badge&logo=linux">
+<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=Dash%20v0.13.14&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.10.2-brightgreen?style=for-the-badge&logo=linux">
   <br>
   <br>
   <p>:trollface: <b>Nezha Monitoring</b> self-hosted lightweight monitoring and operation and maintenance system. Supports system status, HTTP (SSL certificate change, upcoming expiration, expiration), TCP, Ping <b>monitoring</b> and <b>alerting</b>, execute scheduled tasks and <b>web terminal</b>.</p>

script/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+echo -e "nameserver 127.0.0.11\nnameserver 8.8.8.8\nnameserver 223.5.5.5\n" > /etc/resolv.conf
+/dashboard/app

script/install.sh

@@ -130,10 +130,10 @@ install_base() {
 
 install_soft() {
     # Arch官方库不包含selinux等组件
-    (command -v yum >/dev/null 2>&1 && yum install $* selinux-policy -y) ||
+    (command -v yum >/dev/null 2>&1 && yum makecache && yum install $* selinux-policy -y) ||
-        (command -v apt >/dev/null 2>&1 && apt install $* selinux-utils -y) ||
+        (command -v apt >/dev/null 2>&1 && apt update && apt install $* selinux-utils -y) ||
         (command -v pacman >/dev/null 2>&1 && pacman -Syu $*) ||
-        (command -v apt-get >/dev/null 2>&1 && apt-get install $* selinux-utils -y)
+        (command -v apt-get >/dev/null 2>&1 && apt-get update && apt-get install $* selinux-utils -y)
 }
 
 install_dashboard() {

script/install_en.sh

@@ -100,10 +100,10 @@ install_base() {
 
 install_soft() {
     # The official Arch library does not contain selinux components
-    (command -v yum >/dev/null 2>&1 && yum install $* selinux-policy -y) ||
+    (command -v yum >/dev/null 2>&1 && yum makecache && yum install $* selinux-policy -y) ||
-        (command -v apt >/dev/null 2>&1 && apt install $* selinux-utils -y) ||
+        (command -v apt >/dev/null 2>&1 && apt update && apt install $* selinux-utils -y) ||
         (command -v pacman >/dev/null 2>&1 && pacman -Syu $*) ||
-        (command -v apt-get >/dev/null 2>&1 && apt-get install $* selinux-utils -y)
+        (command -v apt-get >/dev/null 2>&1 && apt-get update && apt-get install $* selinux-utils -y)
 }
 
 install_dashboard() {

service/singleton/singleton.go

@@ -12,7 +12,7 @@ import (
 	"github.com/naiba/nezha/pkg/utils"
 )
 
-var Version = "v0.13.13" // ！！记得修改 README 中的 badge 版本！！
+var Version = "v0.13.14" // ！！记得修改 README 中的 badge 版本！！
 
 var (
 	Conf  *model.Config