Merge branch 'master' into master

This commit is contained in:
Brandon Hubbard 2026-01-16 16:21:49 -08:00 committed by GitHub
commit 5da89e3f56
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 51 additions and 7 deletions

48
.github/workflows/build-docker-base.yml vendored Normal file
View File

@ -0,0 +1,48 @@
name: Build Docker Base Images
on:
workflow_dispatch: # Allow manual trigger
permissions: {}
jobs:
build-docker-base:
runs-on: ubuntu-latest
timeout-minutes: 120
permissions:
contents: read
packages: write
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
with: { persist-credentials: false }
- name: Set up QEMU
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
- name: Login to Docker Hub
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Login to GitHub Container Registry
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }}
- name: Use Node.js 20
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
with:
node-version: 20
- name: Build and push base2-slim image
run: npm run build-docker-base-slim
- name: Build and push base2 image
run: npm run build-docker-base

View File

@ -39,7 +39,7 @@
"General Monitor Type": "General Monitor Type", "General Monitor Type": "General Monitor Type",
"Passive Monitor Type": "Passive Monitor Type", "Passive Monitor Type": "Passive Monitor Type",
"Specific Monitor Type": "Specific Monitor Type", "Specific Monitor Type": "Specific Monitor Type",
"markdownSupported": "Markdown syntax supported", "markdownSupported": "Markdown syntax supported. If using HTML, avoid leading spaces to prevent formatting issues.",
"pauseDashboardHome": "Pause", "pauseDashboardHome": "Pause",
"Pause": "Pause", "Pause": "Pause",
"Name": "Name", "Name": "Name",

View File

@ -25,9 +25,7 @@
class="form-control" class="form-control"
data-testid="description-input" data-testid="description-input"
></textarea> ></textarea>
<div class="form-text"> <div class="form-text">{{ $t("markdownSupported") }}</div>
{{ $t("markdownSupported") }}
</div>
</div> </div>
<!-- Footer Text --> <!-- Footer Text -->
@ -39,9 +37,7 @@
class="form-control" class="form-control"
data-testid="footer-text-input" data-testid="footer-text-input"
></textarea> ></textarea>
<div class="form-text"> <div class="form-text">{{ $t("markdownSupported") }}</div>
{{ $t("markdownSupported") }}
</div>
</div> </div>
<div class="my-3"> <div class="my-3">