From 159bfed59bb2a89233a3a92de2e0482cec708374 Mon Sep 17 00:00:00 2001 From: Tau Date: Fri, 29 Nov 2024 02:55:40 +0100 Subject: [PATCH] switches to debian sid base --- .github/workflows/release.yml | 11 ----------- .github/workflows/vib-build.yml | 10 ---------- includes.container/etc/os-release | 11 +++++++++++ recipe.yml | 10 ++++++---- 4 files changed, 17 insertions(+), 25 deletions(-) create mode 100644 includes.container/etc/os-release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2a629ca..216db49 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,19 +11,8 @@ env: REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }} jobs: - verify-image: - runs-on: ubuntu-latest - - steps: - - name: Verify Base Image Integrity - run: - gh attestation verify oci://ghcr.io/vanilla-os/pico:main --owner Vanilla-OS - env: - GH_TOKEN: ${{ github.token }} - release: runs-on: ubuntu-latest - needs: verify-image permissions: contents: write # Allow actions to create release attestations: write # To create and write attestations diff --git a/.github/workflows/vib-build.yml b/.github/workflows/vib-build.yml index 1c2e9e3..4cf7cd2 100644 --- a/.github/workflows/vib-build.yml +++ b/.github/workflows/vib-build.yml @@ -13,19 +13,9 @@ env: BUILDX_NO_DEFAULT_ATTESTATIONS: 1 jobs: - verify-image: - runs-on: ubuntu-latest - - steps: - - name: Verify Base Image Integrity - run: - gh attestation verify oci://ghcr.io/vanilla-os/pico:main --owner Vanilla-OS - env: - GH_TOKEN: ${{ github.token }} build: runs-on: ubuntu-latest - needs: verify-image permissions: contents: write # Allow actions to create release packages: write # Allow pushing images to GHCR diff --git a/includes.container/etc/os-release b/includes.container/etc/os-release new file mode 100644 index 0000000..370382b --- /dev/null +++ b/includes.container/etc/os-release @@ -0,0 +1,11 @@ +PRETTY_NAME="Vanilla OS 2.0" +NAME="Vanilla OS" +VERSION_ID="2.0" +VERSION="2.0 Orchid" +VERSION_CODENAME="orchid" +ID=vanilla +ID_LIKE=debian +HOME_URL="https://vanillaos.org" +SUPPORT_URL="https://vanillaos.org/help" +BUG_REPORT_URL="https://github.com/vanilla-os" +PRIVACY_POLICY_URL="https://vanillaos.org/os-privacy-policy" \ No newline at end of file diff --git a/recipe.yml b/recipe.yml index 0e14494..9229feb 100644 --- a/recipe.yml +++ b/recipe.yml @@ -2,17 +2,19 @@ name: Vanilla VSO id: vso stages: - id: build - base: ghcr.io/vanilla-os/pico:main + base: debian:sid singlelayer: false labels: maintainer: Vanilla OS Contributors args: DEBIAN_FRONTEND: noninteractive - runs: - commands: - - echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/01norecommends modules: + - name: apt-update + type: shell + commands: + - apt-get update + - name: base-files type: dpkg-buildpackage source: