Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/workflows/deploy-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,25 @@ jobs:
${{ env.REGISTRY }}/${{ steps.image_name.outputs.value }}:develop-omnibus
cache-from: type=gha,scope=testing-omnibus
cache-to: type=gha,mode=max,scope=testing-omnibus

# The all-in-one image above starts its collectors from
# rootfs/etc/services.d, so it cannot exercise a change to any
# docker/entrypoint-collector*.sh script. Without this second image a
# collector-side fix has no testing tag at all, and a reporter has nothing
# to try before the next stable release.
#
# amd64 only, deliberately. This image installs zfsutils-linux, mdadm,
# btrfs-progs and fio, and emulating that build for arm64 under QEMU would
# dominate the runtime of every develop push. Stable releases still publish
# both architectures.
- name: Build and push testing collector-omnibus image
uses: docker/build-push-action@v7
with:
platforms: linux/amd64
context: .
file: docker/Dockerfile.collector-omnibus
push: true
tags: |
${{ env.REGISTRY }}/${{ steps.image_name.outputs.value }}:develop-collector-omnibus
cache-from: type=gha,scope=testing-collector-omnibus
cache-to: type=gha,mode=max,scope=testing-collector-omnibus
12 changes: 8 additions & 4 deletions docs/DEPLOYMENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ For release-version verification details, see [RELEASE_VERSION_VERIFICATION.md](

| Environment | Branch | Workflow | Published Image | Notes |
| --- | --- | --- | --- | --- |
| Testing | `develop` | `.github/workflows/deploy-testing.yml` | `ghcr.io/starosdev/scrutiny:develop` and `develop-omnibus` | External hosts pull these tags when they want the latest testing build |
| Testing | `develop` | `.github/workflows/deploy-testing.yml` | `ghcr.io/starosdev/scrutiny:develop`, `develop-omnibus`, and `develop-collector-omnibus` | External hosts pull these tags when they want the latest testing build. `develop-collector-omnibus` is amd64 only |
| Beta | `beta` | `.github/workflows/deploy-beta.yml` | `ghcr.io/starosdev/scrutiny:beta` and `beta-omnibus` | External hosts pull these tags when they want a pre-release candidate ahead of stable |
| Production | release tag | `.github/workflows/docker-build.yaml` | `ghcr.io/starosdev/scrutiny:latest` and `latest-omnibus` | External hosts pull these tags when they want the latest production build |

Expand All @@ -18,9 +18,13 @@ The current GHCR channel tag set is:

| Channel | Tags |
| --- | --- |
| Stable | `latest`, `latest-omnibus`, `latest-web`, `latest-collector`, `latest-collector-zfs`, `latest-collector-mdadm`, `latest-collector-btrfs`, `latest-collector-performance` |
| Beta | `beta`, `beta-omnibus`, `beta-web`, `beta-collector`, `beta-collector-zfs`, `beta-collector-mdadm`, `beta-collector-btrfs`, `beta-collector-performance` |
| Testing | `develop`, `develop-omnibus`, `develop-web`, `develop-collector`, `develop-collector-zfs`, `develop-collector-mdadm`, `develop-collector-btrfs`, `develop-collector-performance` |
| Stable | `latest`, `latest-omnibus`, `latest-web`, `latest-collector`, `latest-collector-omnibus`, `latest-collector-zfs`, `latest-collector-mdadm`, `latest-collector-btrfs`, `latest-collector-performance` |
| Beta | `beta`, `beta-omnibus` |
| Testing | `develop`, `develop-omnibus`, `develop-collector-omnibus` |

The stable set comes from `docker/image-matrix.json`, which the release workflow
builds in full. The beta and testing channels publish a deliberately smaller set,
so a tag that exists for stable is not guaranteed to exist for them.

The legacy `master-omnibus`, `master-web`, and `master-collector` tags still resolve in GHCR but are frozen legacy images. They are not generated by current workflows. There is no `testing` tag.

Expand Down
2 changes: 1 addition & 1 deletion docs/TROUBLESHOOTING_DOCKER.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The CI script used to orchestrate the Docker image builds lives in `.github/work

Scrutiny uses two branch-backed image channels and one release-backed stable channel:

- `develop` branch -> `develop` and `develop-omnibus`
- `develop` branch -> `develop`, `develop-omnibus`, and `develop-collector-omnibus`
- `beta` branch -> `beta` and `beta-omnibus`
- release tag -> `latest` and `latest-omnibus`

Expand Down
Loading