sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 22:53:59 +00:00
Code Issues Releases Wiki Activity

Switch docker images to debian (#1626)

Browse Source
This commit is contained in:
Otto Winter
2021-03-20 20:58:46 +01:00
committed by GitHub
parent 452ca8e4c6
commit 89d0d41c5a
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.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="2.8.0" base_version="3.0.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}"
@@ -45,7 +45,7 @@ jobs:
run: | run: |
docker pull "${BUILD_TO}:dev" || true docker pull "${BUILD_TO}:dev" || true
- name: Register QEMU binfmt - 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: | - run: |
docker build \ docker build \
--build-arg "BUILD_FROM=${BUILD_FROM}" \ --build-arg "BUILD_FROM=${BUILD_FROM}" \

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

@@ -174,7 +174,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="2.8.0" base_version="3.0.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}"
@@ -193,7 +193,7 @@ jobs:
run: | run: |
docker pull "${BUILD_TO}:dev" || true docker pull "${BUILD_TO}:dev" || true
- name: Register QEMU binfmt - 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: | - run: |
docker build \ docker build \
--build-arg "BUILD_FROM=${BUILD_FROM}" \ --build-arg "BUILD_FROM=${BUILD_FROM}" \

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

@@ -194,7 +194,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="2.8.0" base_version="3.0.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}"
@@ -221,7 +221,7 @@ jobs:
run: | run: |
docker pull "${BUILD_TO}:${CACHE_TAG}" || true docker pull "${BUILD_TO}:${CACHE_TAG}" || true
- name: Register QEMU binfmt - 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: | - run: |
docker build \ docker build \
--build-arg "BUILD_FROM=${BUILD_FROM}" \ --build-arg "BUILD_FROM=${BUILD_FROM}" \

2
docker/Dockerfile
View File

@@ -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} 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

2
docker/Dockerfile.dev
View File

@@ -1,4 +1,4 @@
FROM esphome/esphome-base-amd64:2.8.0 FROM esphome/esphome-base-amd64:3.0.0
COPY . . COPY . .

2
docker/Dockerfile.lint
View File

@@ -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 / COPY requirements.txt requirements_test.txt docker/platformio_install_deps.py platformio.ini /
RUN \ RUN \