From 65b39590652c5b48acbb7a4cf5d3a2f6ccd49385 Mon Sep 17 00:00:00 2001 From: Gerald Pinder <4626052+gmpinder@users.noreply.github.com> Date: Sun, 23 Jul 2023 16:31:15 -0400 Subject: [PATCH] Rename images --- .github/CODEOWNERS | 1 - .github/dependabot.yml | 13 -- .github/semantic.yml | 2 - .github/workflows/build.yml | 191 ------------------ .gitlab-ci.yml | 2 +- recipe-desktop.yml | 2 +- ...e-framework.yml => recipe-framework-13.yml | 2 +- 7 files changed, 3 insertions(+), 210 deletions(-) delete mode 100644 .github/CODEOWNERS delete mode 100644 .github/dependabot.yml delete mode 100644 .github/semantic.yml delete mode 100644 .github/workflows/build.yml rename recipe-framework.yml => recipe-framework-13.yml (98%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index f6a87d2..0000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @castrojo diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index d26c3c4..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,13 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates - -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - - diff --git a/.github/semantic.yml b/.github/semantic.yml deleted file mode 100644 index b5161df..0000000 --- a/.github/semantic.yml +++ /dev/null @@ -1,2 +0,0 @@ -enabled: true -titleOnly: true diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 0abbab3..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,191 +0,0 @@ -name: build-ublue -on: - # Build *every* branch at 10:20pm UTC every day (1 hr delay after "nvidia" builds), - # regardless of the branch names. (Not just "live, template and main" branches.) - # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule - schedule: - - cron: "20 22 * * *" - # Build automatically after pushing commits or tags to the "live", "template" - # or "main" branches, except when the commit only affects "documentation" text files. - # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#push - push: - branches: - - live - - template - - main - paths-ignore: - - "**.md" - - "**.txt" - # Build pull requests whenever they are opened or updated, to make sure they - # work. The build won't be deployed, since we filter out PRs in the deployment - # stage. Note that submitted PRs run the workflow of the *fork's* own primary - # branch, using the fork's own secrets/environment. Please be sure to sync - # your primary branch with upstream's latest workflow before submitting PRs! - # For pull requests, we build *any* branch regardless of name, to allow "build - # checks" to succeed for typical PR branch names such as "fix-something". - # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request - pull_request: - paths-ignore: - - "**.md" - - "**.txt" - # Build when manually triggering this workflow for a branch. This allows you - # to build any branch, even if it's not listed in the automated triggers above. - # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_dispatch - workflow_dispatch: - -env: - IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} - -jobs: - push-ghcr: - # Only deploys the branch named "live". Ignores all other branches, to allow - # having "development" branches without interfering with GHCR image uploads. - name: Build and push image - runs-on: ubuntu-22.04 - permissions: - contents: read - packages: write - id-token: write - strategy: - fail-fast: false - matrix: - recipe: - - recipe-framework.yml - - recipe-desktop.yml - - steps: - # Checkout push-to-registry action GitHub repository - - name: Checkout Push to Registry action - uses: actions/checkout@v3 - - - name: Add yq for reading recipe.yml - uses: mikefarah/yq@v4.34.1 - - - name: Gather image data from recipe - run: | - echo "IMAGE_NAME=$(yq '.name' ./${{ matrix.recipe }})" >> $GITHUB_ENV - echo "IMAGE_DESCRIPTION=$(yq '.description' ./${{ matrix.recipe }})" >> $GITHUB_ENV - echo "FEDORA_MAJOR_VERSION=$(yq '.fedora-version' ./${{ matrix.recipe }})" >> $GITHUB_ENV - echo "BASE_IMAGE_URL=$(yq '.base-image' ./${{ matrix.recipe }})" >> $GITHUB_ENV - - - name: Generate tags - id: generate-tags - shell: bash - run: | - # Generate a timestamp for creating an image version history - TIMESTAMP="$(date +%Y%m%d)" - MAJOR_VERSION="${{ env.FEDORA_MAJOR_VERSION }}" - COMMIT_TAGS=() - BUILD_TAGS=() - # Have tags for tracking builds during pull request - SHA_SHORT="${GITHUB_SHA::7}" - COMMIT_TAGS+=("pr-${{ github.event.number }}-${MAJOR_VERSION}") - COMMIT_TAGS+=("${SHA_SHORT}-${MAJOR_VERSION}") - - BUILD_TAGS=("${MAJOR_VERSION}" "${MAJOR_VERSION}-${TIMESTAMP}") - - BUILD_TAGS+=("${TIMESTAMP}") - BUILD_TAGS+=("latest") - - if [[ "${{ github.event_name }}" == "pull_request" ]]; then - echo "Generated the following commit tags: " - for TAG in "${COMMIT_TAGS[@]}"; do - echo "${TAG}" - done - alias_tags=("${COMMIT_TAGS[@]}") - else - alias_tags=("${BUILD_TAGS[@]}") - fi - echo "Generated the following build tags: " - for TAG in "${BUILD_TAGS[@]}"; do - echo "${TAG}" - done - echo "alias_tags=${alias_tags[*]}" >> $GITHUB_OUTPUT - - - name: Get current version - id: labels - run: | - ver=$(skopeo inspect docker://quay.io/fedora-ostree-desktops/${{ env.IMAGE_NAME }}:${{ matrix.major_version }} | jq -r '.Labels["org.opencontainers.image.version"]') - echo "VERSION=$ver" >> $GITHUB_OUTPUT - - # Build metadata - - name: Image Metadata - uses: docker/metadata-action@v4 - id: meta - with: - images: | - ${{ env.IMAGE_NAME }} - labels: | - org.opencontainers.image.title=${{ env.IMAGE_NAME }} - org.opencontainers.image.version=${{ steps.labels.outputs.VERSION }} - org.opencontainers.image.description=${{ env.IMAGE_DESCRIPTION }} - io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/startingpoint/main/README.md - io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4 - - # Build image using Buildah action - - name: Build Image - id: build_image - uses: redhat-actions/buildah-build@v2 - with: - containerfiles: | - ./Containerfile - image: ${{ env.IMAGE_NAME }} - tags: | - ${{ steps.generate-tags.outputs.alias_tags }} - build-args: | - FEDORA_MAJOR_VERSION=${{ env.FEDORA_MAJOR_VERSION }} - BASE_IMAGE_URL=${{ env.BASE_IMAGE_URL }} - RECIPE=${{ matrix.recipe }} - labels: ${{ steps.meta.outputs.labels }} - oci: false - - # Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR. - # https://github.com/macbre/push-to-ghcr/issues/12 - - name: Lowercase Registry - id: registry_case - uses: ASzc/change-string-case-action@v5 - with: - string: ${{ env.IMAGE_REGISTRY }} - - # Push the image to GHCR (Image Registry) - - name: Push To GHCR - uses: redhat-actions/push-to-registry@v2 - id: push - if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live' - env: - REGISTRY_USER: ${{ github.actor }} - REGISTRY_PASSWORD: ${{ github.token }} - with: - image: ${{ steps.build_image.outputs.image }} - tags: ${{ steps.build_image.outputs.tags }} - registry: ${{ steps.registry_case.outputs.lowercase }} - username: ${{ env.REGISTRY_USER }} - password: ${{ env.REGISTRY_PASSWORD }} - extra-args: | - --disable-content-trust - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live' - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - # Sign container - - uses: sigstore/cosign-installer@v3.1.0 - if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live' - - - name: Sign container image - if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live' - run: | - cosign sign -y --key env://COSIGN_PRIVATE_KEY ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}@${TAGS} - env: - TAGS: ${{ steps.push.outputs.digest }} - COSIGN_EXPERIMENTAL: false - COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }} - - - name: Echo outputs - if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live' - run: | - echo "${{ toJSON(steps.push.outputs) }}" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8fc7cab..110e017 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ build: matrix: - RECIPE: - recipe-desktop.yml - - recipe-framework.yml + - recipe-framework-13.yml script: - buildah build --build-arg=RECIPE=$RECIPE --build-arg=FEDORA_MAJOR_VERSION=$FEDORA_MAJOR_VERSION --build-arg BASE_IMAGE_URL=$BASE_IMAGE_URL -t $FULL_IMAGE_NAME:${TAGS} . - | diff --git a/recipe-desktop.yml b/recipe-desktop.yml index 7b0f3f6..d23bfb2 100644 --- a/recipe-desktop.yml +++ b/recipe-desktop.yml @@ -1,4 +1,4 @@ -name: wunker-os-desktop +name: desktop base-image: ghcr.io/ublue-os/kinoite-nvidia fedora-version: 38 description: The image of Wunker OS for an Nvidia based desktop meant for gaming. Make your own! https://ublue.it/making-your-own/ diff --git a/recipe-framework.yml b/recipe-framework-13.yml similarity index 98% rename from recipe-framework.yml rename to recipe-framework-13.yml index 2072673..364344d 100644 --- a/recipe-framework.yml +++ b/recipe-framework-13.yml @@ -1,4 +1,4 @@ -name: wunker-os-framework +name: framework-13 base-image: ghcr.io/ublue-os/kinoite-main fedora-version: 38 description: The image of Wunker OS for a Framework laptop. Make your own! https://ublue.it/making-your-own/