diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index 65f847bc66..e156dbf1e2 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -37,7 +37,7 @@ jobs: strategy: fail-fast: false matrix: - arch: [amd64, armv7, aarch64] + arch: [amd64, aarch64] build_type: ["ha-addon", "docker", "lint"] steps: - uses: actions/checkout@v4.1.7 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ca266c1f2c..d406ee0069 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,7 +80,6 @@ jobs: matrix: platform: - linux/amd64 - - linux/arm/v7 - linux/arm64 steps: - uses: actions/checkout@v4.1.7 diff --git a/docker/Dockerfile b/docker/Dockerfile index 429f5c4a1f..1db1ee7b51 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -51,19 +51,7 @@ ENV \ # Store globally installed pio libs in /piolibs PLATFORMIO_GLOBALLIB_DIR=/piolibs -# Support legacy binaries on Debian multiarch system. There is no "correct" way -# to do this, other than using properly built toolchains... -# See: https://unix.stackexchange.com/questions/553743/correct-way-to-add-lib-ld-linux-so-3-in-debian RUN \ - if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \ - ln -s /lib/arm-linux-gnueabihf/ld-linux-armhf.so.3 /lib/ld-linux.so.3; \ - fi - -RUN \ - # Ubuntu python3-pip is missing wheel - if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \ - export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \ - fi; \ pip3 install \ --break-system-packages --no-cache-dir \ # Keep platformio version in sync with requirements.txt @@ -82,14 +70,6 @@ RUN --mount=type=tmpfs,target=/root/.cargo <