Remove deprecated archs (#263)

Author: edenhaus

Dockerfile

@@ -14,15 +14,9 @@ RUN \
         docker-cli-buildx \
         coreutils \
     \
-    && if [ "${BUILD_ARCH}" = "armhf" ] || [ "${BUILD_ARCH}" = "armv7" ]; then \
-        wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_arm"; \
-        wget -q -O /usr/bin/cosign "https://github.com/home-assistant/cosign/releases/download/${COSIGN_VERSION}/cosign_armhf"; \
-    elif [ "${BUILD_ARCH}" = "aarch64" ]; then \
+    && if [ "${BUILD_ARCH}" = "aarch64" ]; then \
         wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_arm64"; \
         wget -q -O /usr/bin/cosign "https://github.com/home-assistant/cosign/releases/download/${COSIGN_VERSION}/cosign_aarch64"; \
-    elif [ "${BUILD_ARCH}" = "i386" ]; then \
-        wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_386"; \
-        wget -q -O /usr/bin/cosign "https://github.com/home-assistant/cosign/releases/download/${COSIGN_VERSION}/cosign_i386"; \
     elif [ "${BUILD_ARCH}" = "amd64" ]; then \
         wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64"; \
         wget -q -O /usr/bin/cosign "https://github.com/home-assistant/cosign/releases/download/${COSIGN_VERSION}/cosign_amd64"; \

README.md

@@ -109,16 +109,10 @@ Options:
         Use this to set build_from tag if not specified.
 
   Architecture
-    --armhf
-        Build for arm v6.
-    --armv7
-        Build for arm v7.
     --amd64
         Build for intel/amd 64bit.
     --aarch64
         Build for arm 64bit.
-    --i386
-        Build for intel/amd 32bit.
     --all
         Build all architecture.
 
@@ -170,12 +164,6 @@ amd64:
 docker pull ghcr.io/home-assistant/amd64-builder:latest
 ```
 
-armv7:
-
-```bash
-docker pull ghcr.io/home-assistant/armv7-builder:latest
-```
-
 aarch64:
 
 ```bash

build.yaml

@@ -1,10 +1,7 @@
 image: "ghcr.io/home-assistant/{arch}-builder"
 build_from:
   aarch64: "ghcr.io/home-assistant/aarch64-base:3.22"
-  armv7: "ghcr.io/home-assistant/armv7-base:3.22"
-  armhf: "ghcr.io/home-assistant/armhf-base:3.22"
   amd64: "ghcr.io/home-assistant/amd64-base:3.22"
-  i386: "ghcr.io/home-assistant/i386-base:3.22"
 cosign:
   base_identity: https://github.com/home-assistant/docker-base/.*
   identity: https://github.com/home-assistant/builder/.*

builder.sh

@@ -43,21 +43,13 @@ declare -A BUILD_MACHINE=(
                           [odroid-c4]="aarch64" \
                           [odroid-m1]="aarch64" \
                           [odroid-n2]="aarch64" \
-                          [odroid-xu]="armv7" \
-                          [qemuarm]="armhf" \
                           [qemuarm-64]="aarch64" \
-                          [qemux86]="i386" \
                           [qemux86-64]="amd64" \
-                          [raspberrypi]="armhf" \
-                          [raspberrypi2]="armv7" \
-                          [raspberrypi3]="armv7" \
                           [raspberrypi3-64]="aarch64" \
-                          [raspberrypi4]="armv7" \
                           [raspberrypi4-64]="aarch64" \
                           [raspberrypi5-64]="aarch64" \
                           [yellow]="aarch64" \
-                          [green]="aarch64" \
-                          [tinker]="armv7" )
+                          [green]="aarch64" )
 
 
 #### Misc functions ####
@@ -94,16 +86,10 @@ Options:
         Use this to set build_from tag if not specified.
 
   Architecture
-    --armhf
-        Build for arm v6.
-    --armv7
-        Build for arm v7.
     --amd64
         Build for intel/amd 64bit.
     --aarch64
         Build for arm 64bit.
-    --i386
-        Build for intel/amd 32bit.
     --all
         Build all architecture.
 
@@ -243,10 +229,7 @@ function run_build() {
 
     # Set docker platform from build arch
     case "${build_arch}" in
-        armhf)      docker_platform="linux/arm/v6" ;;
-        armv7)      docker_platform="linux/arm/v7" ;;
         amd64)      docker_platform="linux/amd64" ;;
-        i386)       docker_platform="linux/386" ;;
         aarch64)    docker_platform="linux/arm64" ;;
         *)          bashio::exit.nok "Recived unknown architecture ${build_arch}" ;;
     esac
@@ -259,17 +242,6 @@ function run_build() {
         cosign_issuer="$(jq --raw-output '.cosign.issuer // "https://token.actions.githubusercontent.com"' "/tmp/build_config/build.json")"
     fi
 
-    # Adjust Qemu CPU
-    if bashio::var.equals "${build_arch}" armhf; then
-        docker_cli+=("--build-arg" "QEMU_CPU=arm1176")
-    fi
-
-    # Ensure docker reports correct architecture
-    # to the containerized build process
-    if bashio::var.equals "${build_arch}" i386; then
-        docker_wrapper="linux32"
-    fi
-
     # Check if image exists on docker hub
     if bashio::var.true "$DOCKER_HUB_CHECK"; then
         metadata="$(curl -s "https://hub.docker.com/v2/repositories/${repository}/${image}/tags/${version}/")"
@@ -917,23 +889,14 @@ while [[ $# -gt 0 ]]; do
             DOCKER_PASSWORD=$2
             shift
 	    ;;
-        --armhf)
-            BUILD_LIST+=("armhf")
-            ;;
-        --armv7)
-            BUILD_LIST+=("armv7")
-            ;;
         --amd64)
             BUILD_LIST+=("amd64")
             ;;
-        --i386)
-            BUILD_LIST+=("i386")
-            ;;
         --aarch64)
             BUILD_LIST+=("aarch64")
             ;;
         --all)
-            BUILD_LIST=("armhf" "armv7" "amd64" "i386" "aarch64")
+            BUILD_LIST=("amd64" "aarch64")
             ;;
         --addon)
             BUILD_TYPE="addon"