From 4e2d4ea16831c40014217d536310f93ca7d4d054 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Jun 2023 11:58:05 +0200 Subject: [PATCH] Bump home-assistant/builder from 2022.01.0 to 2022.03.1 (#80) * Bump home-assistant/builder from 2022.01.0 to 2022.03.1 Bumps [home-assistant/builder](https://github.com/home-assistant/builder) from 2022.01.0 to 2022.03.1. - [Release notes](https://github.com/home-assistant/builder/releases) - [Commits](https://github.com/home-assistant/builder/compare/2022.01.0...2022.03.1) --- updated-dependencies: - dependency-name: home-assistant/builder dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Add explicit platform to build step * Use targetplatform to set from * use cosign * bump version * fix build * bump alpine --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mike Degatano Co-authored-by: Pascal Vizeli --- .github/workflows/builder.yml | 14 ++++++-------- .hadolint.yaml | 3 ++- Dockerfile | 2 +- build.yaml | 16 +++++++++------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index f8c75ca..3c8f2b7 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -46,19 +46,16 @@ jobs: name: Build ${{ matrix.arch }} plugin needs: init runs-on: ubuntu-latest + permissions: + contents: read + packages: write + id-token: write strategy: matrix: arch: ${{ fromJson(needs.init.outputs.architectures) }} steps: - name: Checkout the repository uses: actions/checkout@v3.5.3 - - - name: Login to DockerHub - if: needs.init.outputs.publish == 'true' - uses: docker/login-action@v2.2.0 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry if: needs.init.outputs.publish == 'true' @@ -73,11 +70,12 @@ jobs: run: echo "BUILD_ARGS=--test" >> $GITHUB_ENV - name: Build plugin - uses: home-assistant/builder@2022.01.0 + uses: home-assistant/builder@2023.06.1 with: args: | $BUILD_ARGS \ --${{ matrix.arch }} \ + --cosign \ --target /data \ --generic ${{ needs.init.outputs.version }} env: diff --git a/.hadolint.yaml b/.hadolint.yaml index 60b0d8c..db6696a 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -1,4 +1,5 @@ ignored: - DL3003 - DL3006 - - DL3018 \ No newline at end of file + - DL3018 + - DL3029 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 2c7d9f8..10ce41c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG BUILD_FROM -FROM golang:1.15-alpine3.13 AS builder +FROM --platform=amd64 golang:1.15-alpine3.13 AS builder WORKDIR /usr/src ARG BUILD_ARCH diff --git a/build.yaml b/build.yaml index cc5a35c..4b9c45a 100644 --- a/build.yaml +++ b/build.yaml @@ -1,14 +1,16 @@ -image: homeassistant/{arch}-hassio-dns -shadow_repository: ghcr.io/home-assistant +image: ghcr.io/home-assistant/{arch}-hassio-dns build_from: - aarch64: ghcr.io/home-assistant/aarch64-base:3.14 - armhf: ghcr.io/home-assistant/armhf-base:3.14 - armv7: ghcr.io/home-assistant/armv7-base:3.14 - amd64: ghcr.io/home-assistant/amd64-base:3.14 - i386: ghcr.io/home-assistant/i386-base:3.14 + aarch64: ghcr.io/home-assistant/aarch64-base:3.17 + armhf: ghcr.io/home-assistant/armhf-base:3.17 + armv7: ghcr.io/home-assistant/armv7-base:3.17 + amd64: ghcr.io/home-assistant/amd64-base:3.17 + i386: ghcr.io/home-assistant/i386-base:3.17 codenotary: signer: notary@home-assistant.io base_image: notary@home-assistant.io +cosign: + base_identity: https://github.com/home-assistant/docker-base/.* + identity: https://github.com/home-assistant/plugin-dns/.* labels: io.hass.type: dns org.opencontainers.image.title: Home Assistant DNS Plugin