add support for using official alamos URLs
This commit is contained in:
parent
c084cd057b
commit
7827e292a7
3 changed files with 42 additions and 17 deletions
|
|
@ -16,16 +16,19 @@ variables:
|
|||
ALPINE_VERSION: "3.24"
|
||||
ALPINE_ARCH: "x86_64"
|
||||
IMAGE_NAME: "alpine-kiosk"
|
||||
# Must match wherever deploy-release actually publishes dist/ to
|
||||
# (MINIO_ENDPOINT/MINIO_BUCKET below) -- this is baked into
|
||||
# latest.json's "url" field, which is what kiosks in the field
|
||||
# actually fetch from, unauthenticated. If this drifts out of sync
|
||||
# with the real deploy target, kiosk-update.sh downloads whatever's
|
||||
# at the stale URL (e.g. a GitLab login page, if this defaults back
|
||||
# to a private job-artifact URL) and fails checksum verification --
|
||||
# which is silent/confusing since the manifest itself still parses
|
||||
# and looks valid.
|
||||
# Two update trains, published side by side in the same bucket:
|
||||
# stable at the bucket root (unchanged -- kiosks already in the field
|
||||
# point their UPDATE_URL here, see config/kiosk.conf.example) and beta
|
||||
# under a "beta/" prefix, fed by the develop branch. Each is baked
|
||||
# into its own latest.json's "url" field (via ARTIFACT_BASE_URL below)
|
||||
# at build time, so it MUST match the prefix deploy-release-* actually
|
||||
# publishes dist/ to (MINIO_BUCKET below) -- if these drift apart,
|
||||
# kiosk-update.sh downloads whatever's at the stale URL (e.g. a
|
||||
# GitLab login page, if this defaults back to a private job-artifact
|
||||
# URL) and fails checksum verification, which is silent/confusing
|
||||
# since the manifest itself still parses and looks valid.
|
||||
PUBLIC_RELEASE_URL: "https://s3.jonasled.de/alamos-alpine-kiosk/"
|
||||
PUBLIC_RELEASE_URL_BETA: "https://s3.jonasled.de/alamos-alpine-kiosk/beta/"
|
||||
|
||||
build-image:
|
||||
stage: build
|
||||
|
|
@ -71,27 +74,46 @@ build-image:
|
|||
expire_in: "30 days"
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
|
||||
- if: '$CI_COMMIT_BRANCH == "develop"'
|
||||
variables:
|
||||
ARTIFACT_BASE_URL: "${PUBLIC_RELEASE_URL_BETA}"
|
||||
- if: '$CI_PIPELINE_SOURCE == "push"'
|
||||
|
||||
deploy-release:
|
||||
.deploy-release-base:
|
||||
stage: deploy
|
||||
image:
|
||||
name: minio/mc
|
||||
entrypoint: [ '' ]
|
||||
# MINIO_ENDPOINT/MINIO_ACCESS_KEY/MINIO_SECRET_KEY must be set as
|
||||
# protected, masked CI/CD variables - never committed. Restrict this
|
||||
# job to protected tag pipelines only (Settings > CI/CD > Protected
|
||||
# branches/tags) so the credentials are never exposed to forks/MRs.
|
||||
# protected, masked CI/CD variables - never committed. Restrict these
|
||||
# jobs to protected branch pipelines only (Settings > CI/CD >
|
||||
# Protected branches) so the credentials are never exposed to forks/
|
||||
# MRs.
|
||||
needs:
|
||||
- job: build-image
|
||||
artifacts: true
|
||||
before_script:
|
||||
- mc alias set minio "${MINIO_ENDPOINT}" "${MINIO_ACCESS_KEY}" "${MINIO_SECRET_KEY}"
|
||||
|
||||
# Stable train: bucket root, unchanged from before so already-deployed
|
||||
# kiosks' UPDATE_URL (config/kiosk.conf.example) keeps working as-is.
|
||||
deploy-release-stable:
|
||||
extends: .deploy-release-base
|
||||
script:
|
||||
- mc cp -r dist/ "minio/${MINIO_BUCKET}/"
|
||||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||
|
||||
# Beta train: published under a "beta/" prefix in the same bucket, must
|
||||
# match PUBLIC_RELEASE_URL_BETA above (baked into this build's
|
||||
# latest.json by build-image's ARTIFACT_BASE_URL override for develop).
|
||||
deploy-release-beta:
|
||||
extends: .deploy-release-base
|
||||
script:
|
||||
- mc cp -r dist/ "minio/${MINIO_BUCKET}/beta/"
|
||||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"
|
||||
|
||||
# --- Renovate bridge for the vendored AMweb.zip -----------------------
|
||||
# The vendor (files.alamos-gmbh.com) exposes no version-numbered
|
||||
# filename and no JSON/HTML manifest -- the only thing that changes
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"VideoCaptureAllowedUrls": ["http://localhost"],
|
||||
"AudioCaptureAllowedUrls": ["http://localhost"],
|
||||
"InsecureContentAllowedForUrls": ["http://localhost"],
|
||||
"LocalNetworkAccessAllowedForUrls": ["http://localhost"],
|
||||
"VideoCaptureAllowedUrls": ["http://localhost", "https://web.alarmmonitor.de"],
|
||||
"AudioCaptureAllowedUrls": ["http://localhost", "https://web.alarmmonitor.de"],
|
||||
"InsecureContentAllowedForUrls": ["http://localhost", "https://web.alarmmonitor.de"],
|
||||
"LocalNetworkAccessAllowedForUrls": ["http://localhost", "https://web.alarmmonitor.de"],
|
||||
"MetricsReportingEnabled": false,
|
||||
"ForcedLanguages": ["de"],
|
||||
"TranslateEnabled": false
|
||||
|
|
|
|||
|
|
@ -83,6 +83,9 @@ ETH_IFACE=""
|
|||
# touched, and a slot that fails to boot cleanly is rolled back
|
||||
# automatically by GRUB (see README's "Updating and rollback").
|
||||
AUTO_UPDATE="true"
|
||||
# Stable train (built from the master branch). For the beta train
|
||||
# (built from develop), point this at
|
||||
# https://s3.jonasled.de/alamos-alpine-kiosk/beta/latest.json instead.
|
||||
UPDATE_URL="https://s3.jonasled.de/alamos-alpine-kiosk/latest.json"
|
||||
# How often to check, in minutes.
|
||||
UPDATE_INTERVAL_MINUTES="60"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue