gilles/scrutiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #291 from AnalogJ/beta

Browse Source
This commit is contained in:
Jason Kulatunga
2022-06-08 22:52:41 -07:00
committed by GitHub
parent fe96c27732 cb47dd7185
commit d486f14433
5 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/ISSUE_TEMPLATE/bug_report.md
+2
View File
@@ -38,3 +38,5 @@ docker exec scrutiny scrutiny-collector-metrics run
``` ```
The log files will be available on your host in the `config` directory. Please attach them to this issue. The log files will be available on your host in the `config` directory. Please attach them to this issue.
Please also provide the output of `docker info`
docker/Dockerfile
+3 -4
View File
@@ -1,5 +1,5 @@
######## ########
FROM golang:1.17.10-buster as backendbuild FROM golang:1.17-bullseye as backendbuild
WORKDIR /go/src/github.com/analogj/scrutiny WORKDIR /go/src/github.com/analogj/scrutiny
@@ -11,7 +11,7 @@ RUN go mod vendor && \
go build -ldflags '-w -extldflags "-static"' -o scrutiny-collector-metrics collector/cmd/collector-metrics/collector-metrics.go go build -ldflags '-w -extldflags "-static"' -o scrutiny-collector-metrics collector/cmd/collector-metrics/collector-metrics.go
######## ########
FROM ubuntu:latest as runtime FROM debian:bullseye-slim as runtime
ARG TARGETARCH ARG TARGETARCH
EXPOSE 8080 EXPOSE 8080
WORKDIR /opt/scrutiny WORKDIR /opt/scrutiny
@@ -25,8 +25,7 @@ RUN apt-get update && apt-get install -y cron smartmontools ca-certificates curl
"arm64") S6_ARCH=aarch64 ;; \ "arm64") S6_ARCH=aarch64 ;; \
esac \ esac \
&& curl https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-${S6_ARCH}.tar.gz -L -s --output /tmp/s6-overlay-${S6_ARCH}.tar.gz \ && curl https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-${S6_ARCH}.tar.gz -L -s --output /tmp/s6-overlay-${S6_ARCH}.tar.gz \
&& tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / --exclude="./bin" \ && tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / \
&& tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C /usr ./bin \
&& rm -rf /tmp/s6-overlay-${S6_ARCH}.tar.gz \ && rm -rf /tmp/s6-overlay-${S6_ARCH}.tar.gz \
&& curl -L https://dl.influxdata.com/influxdb/releases/influxdb2-2.2.0-${TARGETARCH}.deb --output /tmp/influxdb2-2.2.0-${TARGETARCH}.deb \ && curl -L https://dl.influxdata.com/influxdb/releases/influxdb2-2.2.0-${TARGETARCH}.deb --output /tmp/influxdb2-2.2.0-${TARGETARCH}.deb \
&& dpkg -i --force-all /tmp/influxdb2-2.2.0-${TARGETARCH}.deb && dpkg -i --force-all /tmp/influxdb2-2.2.0-${TARGETARCH}.deb
docker/Dockerfile.collector
+2 -2
View File
@@ -1,5 +1,5 @@
######## ########
FROM golang:1.17.10-buster as backendbuild FROM golang:1.17-bullseye as backendbuild
WORKDIR /go/src/github.com/analogj/scrutiny WORKDIR /go/src/github.com/analogj/scrutiny
@@ -10,7 +10,7 @@ RUN go mod vendor && \
go build -ldflags '-w -extldflags "-static"' -o scrutiny-collector-metrics collector/cmd/collector-metrics/collector-metrics.go go build -ldflags '-w -extldflags "-static"' -o scrutiny-collector-metrics collector/cmd/collector-metrics/collector-metrics.go
######## ########
FROM ubuntu:latest as runtime FROM debian:bullseye-slim as runtime
WORKDIR /scrutiny WORKDIR /scrutiny
ENV PATH="/opt/scrutiny/bin:${PATH}" ENV PATH="/opt/scrutiny/bin:${PATH}"
docker/Dockerfile.web
+2 -2
View File
@@ -1,5 +1,5 @@
######## ########
FROM golang:1.17.10-buster as backendbuild FROM golang:1.17-bullseye as backendbuild
WORKDIR /go/src/github.com/analogj/scrutiny WORKDIR /go/src/github.com/analogj/scrutiny
@@ -9,7 +9,7 @@ RUN go mod vendor && \
go build -ldflags '-w -extldflags "-static"' -o scrutiny webapp/backend/cmd/scrutiny/scrutiny.go go build -ldflags '-w -extldflags "-static"' -o scrutiny webapp/backend/cmd/scrutiny/scrutiny.go
######## ########
FROM ubuntu:latest as runtime FROM debian:bullseye-slim as runtime
EXPOSE 8080 EXPOSE 8080
WORKDIR /opt/scrutiny WORKDIR /opt/scrutiny
ENV PATH="/opt/scrutiny/bin:${PATH}" ENV PATH="/opt/scrutiny/bin:${PATH}"
webapp/frontend/src/styles/styles.scss
+13 -7
View File
@@ -5,14 +5,20 @@
// modifications of third party libraries. // modifications of third party libraries.
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
.treo-theme-dark .yellow-50 { .treo-theme-dark {
background-color: #242b38 !important; .yellow-50 {
background-color: #242b38 !important;
.mat-icon { .mat-icon {
color: #0694a2 !important; color: #0694a2 !important;
}
.text-secondary {
color: #0694a2 !important
}
} }
.apexcharts-tooltip {
.text-secondary { background: #242b38 !important;
color: #0694a2 !important //color: orange;
} }
} }