From 12f2f34938245111ef99675cd5dd8f2e91f0238f Mon Sep 17 00:00:00 2001 From: Osterberg Date: Mon, 14 Oct 2024 18:03:22 +0200 Subject: [PATCH 1/4] Remove extra slash --- .github/workflows/shared-steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/shared-steps.yml b/.github/workflows/shared-steps.yml index 0510741..faa338e 100644 --- a/.github/workflows/shared-steps.yml +++ b/.github/workflows/shared-steps.yml @@ -58,7 +58,7 @@ jobs: if: ${{github.event_name != 'pull_request'}} uses: actions/attest-build-provenance@v1 with: - subject-name: ${{ inputs.registry }}//${{ steps.sh_settings.outputs.repository }} + subject-name: ${{ inputs.registry }}/${{ steps.sh_settings.outputs.repository }} subject-digest: ${{ steps.push.outputs.digest }} push-to-registry: true \ No newline at end of file From 1e95cc1437b1473c8e60e21842ec793fde5c5034 Mon Sep 17 00:00:00 2001 From: Osterberg Date: Wed, 16 Oct 2024 14:00:37 +0200 Subject: [PATCH 2/4] Testing to add token --- .github/workflows/shared-steps.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/shared-steps.yml b/.github/workflows/shared-steps.yml index faa338e..1c40402 100644 --- a/.github/workflows/shared-steps.yml +++ b/.github/workflows/shared-steps.yml @@ -61,4 +61,5 @@ jobs: subject-name: ${{ inputs.registry }}/${{ steps.sh_settings.outputs.repository }} subject-digest: ${{ steps.push.outputs.digest }} push-to-registry: true + github-token: ${{ secrets.token }} \ No newline at end of file From 6584eac21ce27f9095ddd3b5e5f5e0b05fe7916d Mon Sep 17 00:00:00 2001 From: Osterberg Date: Wed, 16 Oct 2024 15:13:30 +0200 Subject: [PATCH 3/4] Remove attestation --- .github/workflows/shared-steps.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/shared-steps.yml b/.github/workflows/shared-steps.yml index 1c40402..9c87c3b 100644 --- a/.github/workflows/shared-steps.yml +++ b/.github/workflows/shared-steps.yml @@ -54,12 +54,12 @@ jobs: platforms: linux/amd64,linux/arm64 push: ${{github.event_name != 'pull_request'}} - - name: '[LITE] Generate artifact attestation' - if: ${{github.event_name != 'pull_request'}} - uses: actions/attest-build-provenance@v1 - with: - subject-name: ${{ inputs.registry }}/${{ steps.sh_settings.outputs.repository }} - subject-digest: ${{ steps.push.outputs.digest }} - push-to-registry: true - github-token: ${{ secrets.token }} + #- name: '[LITE] Generate artifact attestation' + # if: ${{github.event_name != 'pull_request'}} + # uses: actions/attest-build-provenance@v1 + # with: + # subject-name: ${{ inputs.registry }}/${{ steps.sh_settings.outputs.repository }} + # subject-digest: ${{ steps.push.outputs.digest }} + # push-to-registry: true + # github-token: ${{ secrets.token }} \ No newline at end of file From ef76502e2f0bfc7914675c04f6ca00255f1fa73d Mon Sep 17 00:00:00 2001 From: Osterberg Date: Thu, 17 Oct 2024 09:55:44 +0200 Subject: [PATCH 4/4] Revert gh cli --- docker/Dockerfile.lite | 2 +- docker/install-scripts/github-cli-lite.sh | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile.lite b/docker/Dockerfile.lite index 15a26e2..1c81f11 100644 --- a/docker/Dockerfile.lite +++ b/docker/Dockerfile.lite @@ -48,7 +48,7 @@ RUN /usr/src/install-scripts/sops.sh --version="v3.9.0" # Install GitHub CLI COPY install-scripts/github-cli-lite.sh /usr/src/install-scripts/github-cli.sh -RUN /usr/src/install-scripts/github-cli.sh --version="2.58.0" +RUN /usr/src/install-scripts/github-cli.sh --version="2.59.0" # Install jq COPY install-scripts/jq-lite.sh /usr/src/install-scripts/jq.sh diff --git a/docker/install-scripts/github-cli-lite.sh b/docker/install-scripts/github-cli-lite.sh index 372835d..b752c1b 100755 --- a/docker/install-scripts/github-cli-lite.sh +++ b/docker/install-scripts/github-cli-lite.sh @@ -13,11 +13,8 @@ while [ $# -gt 0 ]; do shift done -(type -p wget >/dev/null || (apt update && apt-get install wget -y)) \ - && mkdir -p -m 755 /etc/apt/keyrings \ - && wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \ - && chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null +ARCHITECTURE=$(dpkg --print-architecture) +wget -nv https://github.com/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_linux_${ARCHITECTURE}.tar.gz -apt update -apt install -y gh=${VERSION} \ No newline at end of file +tar xzvf gh_${VERSION}_linux_${ARCHITECTURE}.tar.gz +mv gh_${VERSION}_linux_${ARCHITECTURE}/bin/gh /usr/local/bin/gh