Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-10-31 08:25:53 +01:00
Code Issues Projects Releases Wiki Activity

Bump base image to 3.4.0 (#1879)

Browse Source
This commit is contained in:
Otto Winter 2021-06-08 22:03:04 +02:00 committed by GitHub
parent 01e2a51132
commit 4711f36a1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci-docker.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Set up env variables - name: Set up env variables
run: | run: |
base_version="3.1.0" base_version="3.4.0"
if [[ "${{ matrix.build_type }}" == "hassio" ]]; then if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}" build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"

4
.github/workflows/ci.yml vendored
View File

@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
# cpp lint job runs with esphome-lint docker image so that clang-format-* # cpp lint job runs with esphome-lint docker image so that clang-format-*
# doesn't have to be installed # doesn't have to be installed
container: esphome/esphome-lint:1.0 container: esphome/esphome-lint:1.1
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
# Set up the pio project so that the cpp checks know how files are compiled # Set up the pio project so that the cpp checks know how files are compiled
@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
# cpp lint job runs with esphome-lint docker image so that clang-format-* # cpp lint job runs with esphome-lint docker image so that clang-format-*
# doesn't have to be installed # 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 # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files
strategy: strategy:
fail-fast: false fail-fast: false

3
.github/workflows/docker-lint-build.yml vendored
View File

@ -7,6 +7,7 @@ on:
paths: paths:
- 'docker/Dockerfile.lint' - 'docker/Dockerfile.lint'
- 'requirements.txt' - 'requirements.txt'
- 'requirements_optional.txt'
- 'requirements_test.txt' - 'requirements_test.txt'
- 'platformio.ini' - 'platformio.ini'
- '.github/workflows/docker-lint-build.yml' - '.github/workflows/docker-lint-build.yml'
@ -19,7 +20,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Set TAG - name: Set TAG
run: | run: |
echo "TAG=1.0" >> $GITHUB_ENV echo "TAG=1.1" >> $GITHUB_ENV
- name: Pull for cache - name: Pull for cache
run: | run: |
docker pull "esphome/esphome-lint:latest" || true docker pull "esphome/esphome-lint:latest" || true

6
.github/workflows/release-dev.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
# cpp lint job runs with esphome-lint docker image so that clang-format-* # cpp lint job runs with esphome-lint docker image so that clang-format-*
# doesn't have to be installed # doesn't have to be installed
container: esphome/esphome-lint:1.0 container: esphome/esphome-lint:1.1
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
# Set up the pio project so that the cpp checks know how files are compiled # Set up the pio project so that the cpp checks know how files are compiled
@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
# cpp lint job runs with esphome-lint docker image so that clang-format-* # cpp lint job runs with esphome-lint docker image so that clang-format-*
# doesn't have to be installed # 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 # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files
strategy: strategy:
fail-fast: false fail-fast: false
@ -175,7 +175,7 @@ jobs:
echo "TAG=${TAG}" >> $GITHUB_ENV echo "TAG=${TAG}" >> $GITHUB_ENV
- name: Set up env variables - name: Set up env variables
run: | run: |
base_version="3.1.0" base_version="3.4.0"
if [[ "${{ matrix.build_type }}" == "hassio" ]]; then if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}" build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"

6
.github/workflows/release.yml vendored
View File

@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
# cpp lint job runs with esphome-lint docker image so that clang-format-* # cpp lint job runs with esphome-lint docker image so that clang-format-*
# doesn't have to be installed # doesn't have to be installed
container: esphome/esphome-lint:1.0 container: esphome/esphome-lint:1.1
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
# Set up the pio project so that the cpp checks know how files are compiled # Set up the pio project so that the cpp checks know how files are compiled
@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
# cpp lint job runs with esphome-lint docker image so that clang-format-* # cpp lint job runs with esphome-lint docker image so that clang-format-*
# doesn't have to be installed # 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 # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files
strategy: strategy:
fail-fast: false fail-fast: false
@ -195,7 +195,7 @@ jobs:
echo "TAG=${TAG}" >> $GITHUB_ENV echo "TAG=${TAG}" >> $GITHUB_ENV
- name: Set up env variables - name: Set up env variables
run: | run: |
base_version="3.1.0" base_version="3.4.0"
if [[ "${{ matrix.build_type }}" == "hassio" ]]; then if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}" build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"

6
docker/Dockerfile
View File

@ -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} FROM ${BUILD_FROM}
# First install requirements to leverage caching when requirements don't change # 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 \ 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 && /platformio_install_deps.py /platformio.ini
# Then copy esphome and install # Then copy esphome and install

2
docker/Dockerfile.dev
View File

@ -1,4 +1,4 @@
FROM esphome/esphome-base-amd64:3.1.0 FROM esphome/esphome-base-amd64:3.4.0
COPY . . COPY . .

4
docker/Dockerfile.hassio
View File

@ -2,9 +2,9 @@ ARG BUILD_FROM
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
# First install requirements to leverage caching when requirements don't change # 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 \ 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 && /platformio_install_deps.py /platformio.ini
# Copy root filesystem # Copy root filesystem

6
docker/Dockerfile.lint
View File

@ -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 \ 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 && /platformio_install_deps.py /platformio.ini
VOLUME ["/esphome"] VOLUME ["/esphome"]

2
requirements_optional.txt Normal file
View File

@ -0,0 +1,2 @@
pillow>4.0.0
cryptography>=2.0.0,<4

2
requirements_test.txt
View File

@ -1,8 +1,6 @@
pylint==2.8.2 pylint==2.8.2
flake8==3.9.2 flake8==3.9.2
black==21.5b1 black==21.5b1
pillow>4.0.0
cryptography>=2.0.0,<4
pexpect==4.8.0 pexpect==4.8.0
pre-commit pre-commit

2
script/setup
View File

@ -4,7 +4,7 @@
set -e set -e
cd "$(dirname "$0")/.." 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 . pip3 install -e .
pre-commit install pre-commit install