Skip to content

Commit ee549be

Browse files
OttoWinterrspaargaren
authored andcommitted
Remove i386 arch
See also esphome/esphome-docker-base#5
1 parent d095eb6 commit ee549be

File tree

5 files changed

+12
-17
lines changed

5 files changed

+12
-17
lines changed

.github/workflows/release-dev.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
177177
strategy:
178178
matrix:
179-
arch: [amd64, i386, armv7, aarch64]
179+
arch: [amd64, armv7, aarch64]
180180
# Hassio dev image doesn't use esphome/esphome-hassio-$arch and uses base directly
181181
build_type: ["docker"]
182182
steps:
@@ -187,7 +187,7 @@ jobs:
187187
echo "::set-env name=TAG::${TAG}"
188188
- name: Set up env variables
189189
run: |
190-
base_version="2.3.3"
190+
base_version="2.3.4"
191191
192192
if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
193193
build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
@@ -252,13 +252,11 @@ jobs:
252252
docker manifest create esphome/esphome:${TAG} \
253253
esphome/esphome-aarch64:${TAG} \
254254
esphome/esphome-amd64:${TAG} \
255-
esphome/esphome-armv7:${TAG} \
256-
esphome/esphome-i386:${TAG}
255+
esphome/esphome-armv7:${TAG}
257256
docker manifest push esphome/esphome:${TAG}
258257
259258
docker manifest create esphome/esphome:dev \
260259
esphome/esphome-aarch64:${TAG} \
261260
esphome/esphome-amd64:${TAG} \
262-
esphome/esphome-armv7:${TAG} \
263-
esphome/esphome-i386:${TAG}
261+
esphome/esphome-armv7:${TAG}
264262
docker manifest push esphome/esphome:dev

.github/workflows/release.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ jobs:
196196
needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
197197
strategy:
198198
matrix:
199-
arch: [amd64, i386, armv7, aarch64]
199+
arch: [amd64, armv7, aarch64]
200200
build_type: ["hassio", "docker"]
201201
steps:
202202
- uses: actions/checkout@v2
@@ -206,7 +206,7 @@ jobs:
206206
echo "::set-env name=TAG::${TAG}"
207207
- name: Set up env variables
208208
run: |
209-
base_version="2.3.3"
209+
base_version="2.3.4"
210210
211211
if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
212212
build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
@@ -280,17 +280,15 @@ jobs:
280280
docker manifest create esphome/esphome:${TAG} \
281281
esphome/esphome-aarch64:${TAG} \
282282
esphome/esphome-amd64:${TAG} \
283-
esphome/esphome-armv7:${TAG} \
284-
esphome/esphome-i386:${TAG}
283+
esphome/esphome-armv7:${TAG}
285284
docker manifest push esphome/esphome:${TAG}
286285
287286
- name: Publish docker beta tag
288287
run: |
289288
docker manifest create esphome/esphome:beta \
290289
esphome/esphome-aarch64:${TAG} \
291290
esphome/esphome-amd64:${TAG} \
292-
esphome/esphome-armv7:${TAG} \
293-
esphome/esphome-i386:${TAG}
291+
esphome/esphome-armv7:${TAG}
294292
docker manifest push esphome/esphome:beta
295293
296294
- name: Publish docker latest tag
@@ -299,6 +297,5 @@ jobs:
299297
docker manifest create esphome/esphome:latest \
300298
esphome/esphome-aarch64:${TAG} \
301299
esphome/esphome-amd64:${TAG} \
302-
esphome/esphome-armv7:${TAG} \
303-
esphome/esphome-i386:${TAG}
300+
esphome/esphome-armv7:${TAG}
304301
docker manifest push esphome/esphome:latest

docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BUILD_FROM=esphome/esphome-base-amd64:2.3.3
1+
ARG BUILD_FROM=esphome/esphome-base-amd64:2.3.4
22
FROM ${BUILD_FROM}
33

44
# First install requirements to leverage caching when requirements don't change

docker/Dockerfile.dev

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM esphome/esphome-base-amd64:2.3.3
1+
FROM esphome/esphome-base-amd64:2.3.4
22

33
COPY . .
44

docker/Dockerfile.lint

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM esphome/esphome-lint-base:2.3.3
1+
FROM esphome/esphome-lint-base:2.3.4
22

33
COPY requirements.txt requirements_test.txt /
44
RUN pip3 install --no-cache-dir -r /requirements.txt -r /requirements_test.txt

0 commit comments

Comments
 (0)