Skip to content

Commit

Permalink
Update base image 2021.11.0 (home-assistant#60227)
Browse files Browse the repository at this point in the history
  • Loading branch information
pvizeli committed Nov 24, 2021
1 parent 4ffb0b8 commit ed9d403
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 50 deletions.
21 changes: 9 additions & 12 deletions .github/workflows/builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ jobs:
uses: home-assistant/actions/helpers/codenotary@master
with:
source: file://${{ github.workspace }}/OFFICIAL_IMAGE
user: ${{ secrets.VCN_USER }}
password: ${{ secrets.VCN_PASSWORD }}
organisation: home-assistant.io
token: ${{ secrets.CAS_TOKEN }}

build_python:
name: Build PyPi package
Expand Down Expand Up @@ -139,9 +137,9 @@ jobs:
$BUILD_ARGS \
--${{ matrix.arch }} \
--target /data \
--with-codenotary "${{ secrets.VCN_USER }}" "${{ secrets.VCN_PASSWORD }}" "${{ secrets.VCN_ORG }}" \
--validate-from "${{ secrets.VCN_ORG }}" \
--generic ${{ needs.init.outputs.version }}
env:
CAS_API_KEY: ${{ secrets.CAS_TOKEN }}

build_machine:
name: Build ${{ matrix.machine }} machine core image
Expand Down Expand Up @@ -186,14 +184,14 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build base image
uses: home-assistant/builder@2021.09.0
uses: home-assistant/builder@2021.11.3
with:
args: |
$BUILD_ARGS \
--target /data/machine \
--with-codenotary "${{ secrets.VCN_USER }}" "${{ secrets.VCN_PASSWORD }}" "${{ secrets.VCN_ORG }}" \
--validate-from "${{ secrets.VCN_ORG }}" \
--machine "${{ needs.init.outputs.version }}=${{ matrix.machine }}"
env:
CAS_API_KEY: ${{ secrets.CAS_TOKEN }}

publish_ha:
name: Publish version files
Expand Down Expand Up @@ -248,8 +246,8 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Install VCN tools
uses: home-assistant/actions/helpers/vcn@master
- name: Install CAS tools
uses: home-assistant/actions/helpers/cas@master

- name: Build Meta Image
shell: bash
Expand Down Expand Up @@ -293,8 +291,7 @@ jobs:
function validate_image() {
local image=${1}
state="$(vcn authenticate --org home-assistant.io --output json docker://${image} | jq '.verification.status // 2')"
if [[ "${state}" != "0" ]]; then
if ! cas authenticate --signerID notary@home-assistant.io; then
echo "Invalid signature!"
exit 1
fi
Expand Down
22 changes: 0 additions & 22 deletions build.json

This file was deleted.

20 changes: 20 additions & 0 deletions build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
image: homeassistant/{arch}-homeassistant
shadow_repository: ghcr.io/home-assistant
build_from:
aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2021.09.0
armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2021.09.0
armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2021.09.0
amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2021.09.0
i386: ghcr.io/home-assistant/i386-homeassistant-base:2021.09.0
codenotary:
signer: notary@home-assistant.io
base_image: notary@home-assistant.io
labels:
io.hass.type: core
org.opencontainers.image.title: Home Assistant
org.opencontainers.image.description: Open-source home automation platform running on Python 3
org.opencontainers.image.source: https://github.com/home-assistant/core
org.opencontainers.image.authors: The Home Assistant Authors
org.opencontainers.image.url: https://www.home-assistant.io/
org.opencontainers.image.documentation: https://www.home-assistant.io/docs/
org.opencontainers.image.licenses: Apache License 2.0
16 changes: 0 additions & 16 deletions machine/build.json

This file was deleted.

14 changes: 14 additions & 0 deletions machine/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
image: homeassistant/{machine}-homeassistant
shadow_repository: ghcr.io/home-assistant
build_from:
aarch64: "ghcr.io/home-assistant/aarch64-homeassistant:"
armv7: "ghcr.io/home-assistant/armv7-homeassistant:"
armhf: "ghcr.io/home-assistant/armhf-homeassistant:"
amd64: "ghcr.io/home-assistant/amd64-homeassistant:"
i386: "ghcr.io/home-assistant/i386-homeassistant:"
codenotary:
signer: notary@home-assistant.io
base_image: notary@home-assistant.io
labels:
io.hass.type: core
org.opencontainers.image.source: https://github.com/home-assistant/core

0 comments on commit ed9d403

Please sign in to comment.