diff options
| author | Benjamin Sherman <benjamin@holyarmy.org> | 2024-04-22 23:05:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-22 23:05:49 -0500 |
| commit | 7427e32030ddd8edbc336c4b8f251a0de17f3e22 (patch) | |
| tree | a76416d47e8e5efdaa7fb607ae37ddf2230a8bb7 | |
| parent | 13e83d301dacbab7d7fef73022b4c20caf7f6335 (diff) | |
| download | AeroCore-OS-7427e32030ddd8edbc336c4b8f251a0de17f3e22.tar.gz AeroCore-OS-7427e32030ddd8edbc336c4b8f251a0de17f3e22.zip | |
refactor: use repo name as default image name (#7)
Also makes the source image's tag easier to understand in the
Containerfile.
| -rw-r--r-- | .github/workflows/build.yml | 4 | ||||
| -rw-r--r-- | Containerfile | 6 | ||||
| -rw-r--r-- | README.md | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d41d98d..f7cc31b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,8 +14,8 @@ on: workflow_dispatch: env: - MY_IMAGE_NAME: "ublue-custom" # the name of the image produced by this build - MY_IMAGE_DESC: "My Customized Universal Blue System Image" + MY_IMAGE_NAME: "${{ github.event.repository.name }}" # the name of the image produced by this build, matches repo names + MY_IMAGE_DESC: "My Customized Universal Blue Image" IMAGE_REGISTRY: "ghcr.io/${{ github.repository_owner }}" # do not edit jobs: diff --git a/Containerfile b/Containerfile index b4cbcce..5d08ad5 100644 --- a/Containerfile +++ b/Containerfile @@ -35,13 +35,13 @@ ARG SOURCE_IMAGE="silverblue" # - (and the above with testing rather than stable) ARG SOURCE_SUFFIX="-main" -## FEDORA_VERSION arg must be a version built by ublue: eg, 39 or 40 -ARG FEDORA_VERSION="39" +## SOURCE_TAG arg must be a version built for the specific image: eg, 39, 40, gts, latest +ARG SOURCE_TAG="latest" ### 2. SOURCE IMAGE ## this is a standard Containerfile FROM using the build ARGs above to select the right upstream image -FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${FEDORA_VERSION} +FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${SOURCE_TAG} ### 3. MODIFICATIONS @@ -44,7 +44,7 @@ This file defines the operations used to customize the selected image. It contai ### build.yml -This workflow creates your custom OCI image and publishes it to the Github Container Registry (GHCR). +This workflow creates your custom OCI image and publishes it to the Github Container Registry (GHCR). By default, the image name will match the Github repository name. #### Container Signing |