diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml index 59beeea212e3..57ec71845b8c 100644 --- a/.github/workflows/release-dev.yml +++ b/.github/workflows/release-dev.yml @@ -176,7 +176,7 @@ jobs: needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest] strategy: matrix: - arch: [amd64, i386, armv7, aarch64] + arch: [amd64, armv7, aarch64] # Hassio dev image doesn't use esphome/esphome-hassio-$arch and uses base directly build_type: ["docker"] steps: @@ -187,7 +187,7 @@ jobs: echo "::set-env name=TAG::${TAG}" - name: Set up env variables run: | - base_version="2.3.3" + base_version="2.3.4" if [[ "${{ matrix.build_type }}" == "hassio" ]]; then build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}" @@ -252,13 +252,11 @@ jobs: docker manifest create esphome/esphome:${TAG} \ esphome/esphome-aarch64:${TAG} \ esphome/esphome-amd64:${TAG} \ - esphome/esphome-armv7:${TAG} \ - esphome/esphome-i386:${TAG} + esphome/esphome-armv7:${TAG} docker manifest push esphome/esphome:${TAG} docker manifest create esphome/esphome:dev \ esphome/esphome-aarch64:${TAG} \ esphome/esphome-amd64:${TAG} \ - esphome/esphome-armv7:${TAG} \ - esphome/esphome-i386:${TAG} + esphome/esphome-armv7:${TAG} docker manifest push esphome/esphome:dev diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 84610156a158..8196d39fbc3b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -196,7 +196,7 @@ jobs: needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest] strategy: matrix: - arch: [amd64, i386, armv7, aarch64] + arch: [amd64, armv7, aarch64] build_type: ["hassio", "docker"] steps: - uses: actions/checkout@v2 @@ -206,7 +206,7 @@ jobs: echo "::set-env name=TAG::${TAG}" - name: Set up env variables run: | - base_version="2.3.3" + base_version="2.3.4" if [[ "${{ matrix.build_type }}" == "hassio" ]]; then build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}" @@ -280,8 +280,7 @@ jobs: docker manifest create esphome/esphome:${TAG} \ esphome/esphome-aarch64:${TAG} \ esphome/esphome-amd64:${TAG} \ - esphome/esphome-armv7:${TAG} \ - esphome/esphome-i386:${TAG} + esphome/esphome-armv7:${TAG} docker manifest push esphome/esphome:${TAG} - name: Publish docker beta tag @@ -289,8 +288,7 @@ jobs: docker manifest create esphome/esphome:beta \ esphome/esphome-aarch64:${TAG} \ esphome/esphome-amd64:${TAG} \ - esphome/esphome-armv7:${TAG} \ - esphome/esphome-i386:${TAG} + esphome/esphome-armv7:${TAG} docker manifest push esphome/esphome:beta - name: Publish docker latest tag @@ -299,6 +297,5 @@ jobs: docker manifest create esphome/esphome:latest \ esphome/esphome-aarch64:${TAG} \ esphome/esphome-amd64:${TAG} \ - esphome/esphome-armv7:${TAG} \ - esphome/esphome-i386:${TAG} + esphome/esphome-armv7:${TAG} docker manifest push esphome/esphome:latest diff --git a/docker/Dockerfile b/docker/Dockerfile index d0b4f2ffa15a..1a8382aa6585 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=esphome/esphome-base-amd64:2.3.3 +ARG BUILD_FROM=esphome/esphome-base-amd64:2.3.4 FROM ${BUILD_FROM} # First install requirements to leverage caching when requirements don't change diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index b6a0f8f90bdb..9e7ddc4b537f 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM esphome/esphome-base-amd64:2.3.3 +FROM esphome/esphome-base-amd64:2.3.4 COPY . . diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint index bc7caa7e972f..fd1a3c533074 100644 --- a/docker/Dockerfile.lint +++ b/docker/Dockerfile.lint @@ -1,4 +1,4 @@ -FROM esphome/esphome-lint-base:2.3.3 +FROM esphome/esphome-lint-base:2.3.4 COPY requirements.txt requirements_test.txt / RUN pip3 install --no-cache-dir -r /requirements.txt -r /requirements_test.txt