Merge branch 'dev' into proper-checkins

Author: jemand771

.github/workflows/2_unstable.yml

@@ -1,4 +1,5 @@
 .idea
+.vscode
 snap
 prime
 stage

.github/workflows/3_stable.yml

@@ -0,0 +1,4 @@
+[submodule "source/statping-ng.wiki"]
+    path = source/statping-ng.wiki
+    # TODO should this be a relative path? (would require wiki fork for statping forks)
+	url = https://github.com/statping-ng/statping-ng.wiki.git

.github/workflows/1_dev.yml .github/workflows/build.yml.github/workflows/1_dev.yml renamed to .github/workflows/build.yml

@@ -10,18 +10,18 @@ RUN yarn build && yarn cache clean
 
 # Statping Golang BACKEND building from source
 # Creates "/go/bin/statping" and "/usr/local/bin/sass" for copying
-FROM golang:1.17-alpine AS backend
+FROM golang:1.20.0-alpine AS backend
 LABEL maintainer="Statping-NG (https://github.com/statping-ng)"
 ARG VERSION
 ARG COMMIT
 ARG BUILDPLATFORM
 ARG TARGETARCH
-RUN apk add --update --no-cache libstdc++ gcc g++ make git autoconf \
+RUN apk add --no-cache libstdc++ gcc g++ make git autoconf \
     libtool ca-certificates linux-headers wget curl jq && \
     update-ca-certificates
 
 WORKDIR /root
-RUN git clone https://github.com/sass/sassc.git
+RUN git clone --depth 1 --branch 3.6.2 https://github.com/sass/sassc.git
 RUN . sassc/script/bootstrap && make -C sassc -j4
 # sassc binary: /root/sassc/bin/sassc
 
@@ -30,15 +30,17 @@ ADD go.mod go.sum ./
 RUN go mod download
 ENV GO111MODULE on
 ENV CGO_ENABLED 1
-RUN go get github.com/stretchr/testify/assert && \
-    go get github.com/stretchr/testify/require && \
-	go get github.com/GeertJohan/go.rice/rice && \
-	go get github.com/cortesi/modd/cmd/modd && \
-	go get github.com/crazy-max/xgo
-COPY . .
+COPY cmd ./cmd
+COPY database ./database
+COPY handlers ./handlers
+COPY notifiers ./notifiers
+COPY source ./source
+COPY types ./types
+COPY utils ./utils
 COPY --from=frontend /statping/dist/ ./source/dist/
-RUN make clean generate embed
-RUN go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION} -X main.COMMIT=${COMMIT}" -o statping --tags "netgo linux" ./cmd
+RUN go install github.com/GeertJohan/go.rice/rice@latest
+RUN cd source && rice embed-go
+RUN go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=$VERSION -X main.COMMIT=$COMMIT" -o statping --tags "netgo linux" ./cmd
 RUN chmod a+x statping && mv statping /go/bin/statping
 # /go/bin/statping - statping binary
 # /root/sassc/bin/sassc - sass binary
@@ -64,6 +66,6 @@ ENV BASE_PATH=""
 
 EXPOSE $PORT
 
-HEALTHCHECK --interval=60s --timeout=10s --retries=3 CMD if [ -z "$BASE_PATH" ]; then HEALTHPATH="/health"; else HEALTHPATH="/$BASE_PATH/health" ; fi && curl -s "http://localhost:80$HEALTHPATH" | jq -r -e ".online==true"
+HEALTHCHECK --interval=60s --timeout=10s --retries=3 CMD if [ -z "$BASE_PATH" ]; then HEALTHPATH="/health"; else HEALTHPATH="/$BASE_PATH/health" ; fi && curl -s "http://localhost:${PORT}$HEALTHPATH" | jq -r -e ".online==true"
 
 CMD statping --port $PORT

.github/workflows/pr.yml

@@ -40,6 +40,9 @@ up:
 	docker compose -f docker-compose.yml -f dev/docker-compose.full.yml up -d --remove-orphans
 	make print_details
 
+local: clean frontend-build build
+	export STATPING_DIR=./docker/statping/sqlite && ./statping --port 8080
+
 down:
 	docker compose -f docker-compose.yml -f dev/docker-compose.full.yml down --volumes --remove-orphans
 

.gitignore

@@ -24,9 +24,9 @@ Statping-ng aims to be an updated drop-in replacement of statping after developm
   <a href="https://github.com/statping-ng/statping-ng/blob/stable/LICENSE"><img alt="License" src="https://img.shields.io/github/license/statping-ng/statping-ng?color=success&style=for-the-badge&logo" /></a>
 </p><p align="center" style="text-align:center">
   <img alt="Last Commit" src="https://img.shields.io/github/last-commit/statping-ng/statping-ng?style=for-the-badge&logo=github" />
-  <img alt="Dev Build Status" src="https://img.shields.io/github/workflow/status/statping-ng/statping-ng/1.%20Development%20Build%20and%20Testing?label=Dev&style=for-the-badge&logo=github" />
-  <img alt="Unstable Build Status" src="https://img.shields.io/github/workflow/status/statping-ng/statping-ng/2.%20Unstable%20Build,%20Test%20and%20Deploy?label=Unstable&style=for-the-badge&logo=github" />
-  <img alt="Stable Build Status" src="https://img.shields.io/github/workflow/status/statping-ng/statping-ng/3.%20Stable%20Build,%20Test%20and%20Deploy?label=Stable&style=for-the-badge&logo=github" />
+  <img alt="Dev Build Status" src="https://img.shields.io/github/actions/workflow/status/statping-ng/statping-ng/build.yml?branch=dev&label=Dev&style=for-the-badge&logo=github" />
+  <img alt="Unstable Build Status" src="https://img.shields.io/github/actions/workflow/status/statping-ng/statping-ng/build.yml?branch=unstable&label=Unstable&style=for-the-badge&logo=github" />
+  <img alt="Stable Build Status" src="https://img.shields.io/github/actions/workflow/status/statping-ng/statping-ng/build.yml?branch=stable&label=Stable&style=for-the-badge&logo=github" />
 </p><p align="center" style="text-align:center">
   <a href="https://hub.docker.com/r/adamboutcher/statping-ng"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/adamboutcher/statping-ng?style=for-the-badge&logo=docker&logoColor=white" /></a>
   <a href="https://hub.docker.com/r/adamboutcher/statping-ng"><img alt="Docker Image Size" src="https://img.shields.io/docker/image-size/adamboutcher/statping-ng/latest?style=for-the-badge&logo=docker&logoColor=white" /></a>