From 89d0d41c5a45225966ef615127572d6f57b925fe Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Sat, 20 Mar 2021 20:58:46 +0100 Subject: [PATCH] Switch docker images to debian (#1626) --- .github/workflows/ci-docker.yml | 4 ++-- .github/workflows/release-dev.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- docker/Dockerfile | 2 +- docker/Dockerfile.dev | 2 +- docker/Dockerfile.lint | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index 446e7c3eab..7da8a3f8f1 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up env variables run: | - base_version="2.8.0" + base_version="3.0.0" if [[ "${{ matrix.build_type }}" == "hassio" ]]; then build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}" @@ -45,7 +45,7 @@ jobs: run: | docker pull "${BUILD_TO}:dev" || true - name: Register QEMU binfmt - run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes + run: docker run --rm --privileged multiarch/qemu-user-static:5.2.0-2 --reset -p yes - run: | docker build \ --build-arg "BUILD_FROM=${BUILD_FROM}" \ diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml index 1c23e7a957..b4c4a8f17d 100644 --- a/.github/workflows/release-dev.yml +++ b/.github/workflows/release-dev.yml @@ -174,7 +174,7 @@ jobs: echo "TAG=${TAG}" >> $GITHUB_ENV - name: Set up env variables run: | - base_version="2.8.0" + base_version="3.0.0" if [[ "${{ matrix.build_type }}" == "hassio" ]]; then build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}" @@ -193,7 +193,7 @@ jobs: run: | docker pull "${BUILD_TO}:dev" || true - name: Register QEMU binfmt - run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes + run: docker run --rm --privileged multiarch/qemu-user-static:5.2.0-2 --reset -p yes - run: | docker build \ --build-arg "BUILD_FROM=${BUILD_FROM}" \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 479657b065..a1fd2dba24 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -194,7 +194,7 @@ jobs: echo "TAG=${TAG}" >> $GITHUB_ENV - name: Set up env variables run: | - base_version="2.8.0" + base_version="3.0.0" if [[ "${{ matrix.build_type }}" == "hassio" ]]; then build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}" @@ -221,7 +221,7 @@ jobs: run: | docker pull "${BUILD_TO}:${CACHE_TAG}" || true - name: Register QEMU binfmt - run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes + run: docker run --rm --privileged multiarch/qemu-user-static:5.2.0-2 --reset -p yes - run: | docker build \ --build-arg "BUILD_FROM=${BUILD_FROM}" \ diff --git a/docker/Dockerfile b/docker/Dockerfile index aaa3591d9c..7364299ba7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=esphome/esphome-base-amd64:2.8.0 +ARG BUILD_FROM=esphome/esphome-base-amd64:3.0.0 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 081d816e4d..52495fc8ae 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM esphome/esphome-base-amd64:2.8.0 +FROM esphome/esphome-base-amd64:3.0.0 COPY . . diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint index 5eb923de82..5488e68c91 100644 --- a/docker/Dockerfile.lint +++ b/docker/Dockerfile.lint @@ -1,4 +1,4 @@ -FROM esphome/esphome-lint-base:2.8.0 +FROM esphome/esphome-lint-base:3.0.0 COPY requirements.txt requirements_test.txt docker/platformio_install_deps.py platformio.ini / RUN \