From 4711f36a1f4593aa4a8dd5f0cdedc0c6e7d350a3 Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Tue, 8 Jun 2021 22:03:04 +0200 Subject: [PATCH] Bump base image to 3.4.0 (#1879) --- .github/workflows/ci-docker.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/docker-lint-build.yml | 3 ++- .github/workflows/release-dev.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- docker/Dockerfile | 6 +++--- docker/Dockerfile.dev | 2 +- docker/Dockerfile.hassio | 4 ++-- docker/Dockerfile.lint | 6 +++--- requirements_optional.txt | 2 ++ requirements_test.txt | 2 -- script/setup | 2 +- 12 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 requirements_optional.txt diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index edbb2cf003..b5f8b7b0e0 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="3.1.0" + base_version="3.4.0" if [[ "${{ matrix.build_type }}" == "hassio" ]]; then build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5075609526..a27cbe67b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest # cpp lint job runs with esphome-lint docker image so that clang-format-* # doesn't have to be installed - container: esphome/esphome-lint:1.0 + container: esphome/esphome-lint:1.1 steps: - uses: actions/checkout@v2 # Set up the pio project so that the cpp checks know how files are compiled @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest # cpp lint job runs with esphome-lint docker image so that clang-format-* # doesn't have to be installed - container: esphome/esphome-lint:1.0 + container: esphome/esphome-lint:1.1 # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files strategy: fail-fast: false diff --git a/.github/workflows/docker-lint-build.yml b/.github/workflows/docker-lint-build.yml index 4e75a4c162..d254ac332a 100644 --- a/.github/workflows/docker-lint-build.yml +++ b/.github/workflows/docker-lint-build.yml @@ -7,6 +7,7 @@ on: paths: - 'docker/Dockerfile.lint' - 'requirements.txt' + - 'requirements_optional.txt' - 'requirements_test.txt' - 'platformio.ini' - '.github/workflows/docker-lint-build.yml' @@ -19,7 +20,7 @@ jobs: - uses: actions/checkout@v2 - name: Set TAG run: | - echo "TAG=1.0" >> $GITHUB_ENV + echo "TAG=1.1" >> $GITHUB_ENV - name: Pull for cache run: | docker pull "esphome/esphome-lint:latest" || true diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml index 917e273aea..f8b90d524f 100644 --- a/.github/workflows/release-dev.yml +++ b/.github/workflows/release-dev.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest # cpp lint job runs with esphome-lint docker image so that clang-format-* # doesn't have to be installed - container: esphome/esphome-lint:1.0 + container: esphome/esphome-lint:1.1 steps: - uses: actions/checkout@v2 # Set up the pio project so that the cpp checks know how files are compiled @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest # cpp lint job runs with esphome-lint docker image so that clang-format-* # doesn't have to be installed - container: esphome/esphome-lint:1.0 + container: esphome/esphome-lint:1.1 # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files strategy: fail-fast: false @@ -175,7 +175,7 @@ jobs: echo "TAG=${TAG}" >> $GITHUB_ENV - name: Set up env variables run: | - base_version="3.1.0" + base_version="3.4.0" if [[ "${{ matrix.build_type }}" == "hassio" ]]; then build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 806e23d7e4..9523a2164c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest # cpp lint job runs with esphome-lint docker image so that clang-format-* # doesn't have to be installed - container: esphome/esphome-lint:1.0 + container: esphome/esphome-lint:1.1 steps: - uses: actions/checkout@v2 # Set up the pio project so that the cpp checks know how files are compiled @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest # cpp lint job runs with esphome-lint docker image so that clang-format-* # doesn't have to be installed - container: esphome/esphome-lint:1.0 + container: esphome/esphome-lint:1.1 # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files strategy: fail-fast: false @@ -195,7 +195,7 @@ jobs: echo "TAG=${TAG}" >> $GITHUB_ENV - name: Set up env variables run: | - base_version="3.1.0" + base_version="3.4.0" if [[ "${{ matrix.build_type }}" == "hassio" ]]; then build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}" diff --git a/docker/Dockerfile b/docker/Dockerfile index ef547fc0f1..0d126a2944 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,10 +1,10 @@ -ARG BUILD_FROM=esphome/esphome-base-amd64:3.1.0 +ARG BUILD_FROM=esphome/esphome-base-amd64:3.4.0 FROM ${BUILD_FROM} # First install requirements to leverage caching when requirements don't change -COPY requirements.txt docker/platformio_install_deps.py platformio.ini / +COPY requirements.txt requirements_optional.txt docker/platformio_install_deps.py platformio.ini / RUN \ - pip3 install --no-cache-dir -r /requirements.txt \ + pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt \ && /platformio_install_deps.py /platformio.ini # Then copy esphome and install diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index e09eeb6837..ebcf14d1bc 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM esphome/esphome-base-amd64:3.1.0 +FROM esphome/esphome-base-amd64:3.4.0 COPY . . diff --git a/docker/Dockerfile.hassio b/docker/Dockerfile.hassio index b6ff037c35..5dd9339b18 100644 --- a/docker/Dockerfile.hassio +++ b/docker/Dockerfile.hassio @@ -2,9 +2,9 @@ ARG BUILD_FROM FROM ${BUILD_FROM} # First install requirements to leverage caching when requirements don't change -COPY requirements.txt docker/platformio_install_deps.py platformio.ini / +COPY requirements.txt requirements_optional.txt docker/platformio_install_deps.py platformio.ini / RUN \ - pip3 install --no-cache-dir -r /requirements.txt \ + pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt \ && /platformio_install_deps.py /platformio.ini # Copy root filesystem diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint index 4a88667245..60d63152a0 100644 --- a/docker/Dockerfile.lint +++ b/docker/Dockerfile.lint @@ -1,8 +1,8 @@ -FROM esphome/esphome-lint-base:3.1.0 +FROM esphome/esphome-lint-base:3.4.0 -COPY requirements.txt requirements_test.txt docker/platformio_install_deps.py platformio.ini / +COPY requirements.txt requirements_optional.txt requirements_test.txt docker/platformio_install_deps.py platformio.ini / RUN \ - pip3 install --no-cache-dir -r /requirements.txt -r /requirements_test.txt \ + pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt -r /requirements_test.txt \ && /platformio_install_deps.py /platformio.ini VOLUME ["/esphome"] diff --git a/requirements_optional.txt b/requirements_optional.txt new file mode 100644 index 0000000000..2c73430109 --- /dev/null +++ b/requirements_optional.txt @@ -0,0 +1,2 @@ +pillow>4.0.0 +cryptography>=2.0.0,<4 diff --git a/requirements_test.txt b/requirements_test.txt index b5cf617fee..15593a8e12 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,8 +1,6 @@ pylint==2.8.2 flake8==3.9.2 black==21.5b1 -pillow>4.0.0 -cryptography>=2.0.0,<4 pexpect==4.8.0 pre-commit diff --git a/script/setup b/script/setup index 199b46891d..6d095af46c 100755 --- a/script/setup +++ b/script/setup @@ -4,7 +4,7 @@ set -e cd "$(dirname "$0")/.." -pip3 install -r requirements.txt -r requirements_test.txt +pip3 install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt pip3 install -e . pre-commit install