Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-22 13:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Update base image to 1.2.1

Browse source
This commit is contained in:
Otto Winter 2019-02-17 15:54:15 +01:00
parent b27c778cb7
commit 34ca5d6d8a
No known key found for this signature in database
GPG key ID: DB66C0BE6013F97E
4 changed files with 86 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
.gitlab-ci.yml
View file

@ -41,11 +41,11 @@ stages:
- | - |
if [[ "${IS_HASSIO}" == "YES" ]]; then if [[ "${IS_HASSIO}" == "YES" ]]; then
BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.1.0 BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.2.1
BUILD_TO=esphome/esphome-hassio-${BUILD_ARCH} BUILD_TO=esphome/esphome-hassio-${BUILD_ARCH}
DOCKERFILE=docker/Dockerfile.hassio DOCKERFILE=docker/Dockerfile.hassio
else else
BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.1.0 BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.2.1
if [[ "${BUILD_ARCH}" == "amd64" ]]; then if [[ "${BUILD_ARCH}" == "amd64" ]]; then
BUILD_TO=esphome/esphome BUILD_TO=esphome/esphome
else else
@ -177,20 +177,40 @@ deploy-beta:pypi:
.dev-vars: &dev-vars .dev-vars: &dev-vars
DEV: YES DEV: YES
# aarch64 aarch64-beta-docker:
<<: *beta
variables:
BETA: "YES"
BUILD_ARCH: aarch64
IS_HASSIO: "NO"
RELEASE: "YES"
aarch64-beta-hassio: aarch64-beta-hassio:
<<: *beta <<: *beta
variables: variables:
BETA: "YES" BETA: "YES"
BUILD_ARCH: aarch64 BUILD_ARCH: aarch64
RELEASE: "YES"
IS_HASSIO: "YES" IS_HASSIO: "YES"
#aarch64-dev-hassio: RELEASE: "YES"
# <<: *dev aarch64-dev-docker:
# variables: <<: *dev
# BUILD_ARCH: aarch64 variables:
# DEV: "YES" BUILD_ARCH: aarch64
# IS_HASSIO: "YES" DEV: "YES"
IS_HASSIO: "NO"
aarch64-dev-hassio:
<<: *dev
variables:
BUILD_ARCH: aarch64
DEV: "YES"
IS_HASSIO: "YES"
aarch64-latest-docker:
<<: *latest
variables:
BETA: "YES"
BUILD_ARCH: aarch64
IS_HASSIO: "NO"
LATEST: "YES"
RELEASE: "YES"
aarch64-latest-hassio: aarch64-latest-hassio:
<<: *latest <<: *latest
variables: variables:
@ -213,18 +233,18 @@ amd64-beta-hassio:
BUILD_ARCH: amd64 BUILD_ARCH: amd64
IS_HASSIO: "YES" IS_HASSIO: "YES"
RELEASE: "YES" RELEASE: "YES"
#amd64-dev-docker: amd64-dev-docker:
# <<: *dev <<: *dev
# variables: variables:
# BUILD_ARCH: amd64 BUILD_ARCH: amd64
# DEV: "YES" DEV: "YES"
# IS_HASSIO: "NO" IS_HASSIO: "NO"
#amd64-dev-hassio: amd64-dev-hassio:
# <<: *dev <<: *dev
# variables: variables:
# BUILD_ARCH: amd64 BUILD_ARCH: amd64
# DEV: "YES" DEV: "YES"
# IS_HASSIO: "YES" IS_HASSIO: "YES"
amd64-latest-docker: amd64-latest-docker:
<<: *latest <<: *latest
variables: variables:
@ -241,6 +261,13 @@ amd64-latest-hassio:
IS_HASSIO: "YES" IS_HASSIO: "YES"
LATEST: "YES" LATEST: "YES"
RELEASE: "YES" RELEASE: "YES"
armhf-beta-docker:
<<: *beta
variables:
BETA: "YES"
BUILD_ARCH: armhf
IS_HASSIO: "NO"
RELEASE: "YES"
armhf-beta-hassio: armhf-beta-hassio:
<<: *beta <<: *beta
variables: variables:
@ -248,12 +275,26 @@ armhf-beta-hassio:
BUILD_ARCH: armhf BUILD_ARCH: armhf
IS_HASSIO: "YES" IS_HASSIO: "YES"
RELEASE: "YES" RELEASE: "YES"
#armhf-dev-hassio: armhf-dev-docker:
# <<: *dev <<: *dev
# variables: variables:
# BUILD_ARCH: armhf BUILD_ARCH: armhf
# DEV: "YES" DEV: "YES"
# IS_HASSIO: "YES" IS_HASSIO: "NO"
armhf-dev-hassio:
<<: *dev
variables:
BUILD_ARCH: armhf
DEV: "YES"
IS_HASSIO: "YES"
armhf-latest-docker:
<<: *latest
variables:
BETA: "YES"
BUILD_ARCH: armhf
IS_HASSIO: "NO"
LATEST: "YES"
RELEASE: "YES"
armhf-latest-hassio: armhf-latest-hassio:
<<: *latest <<: *latest
variables: variables:
@ -276,18 +317,18 @@ i386-beta-hassio:
BUILD_ARCH: i386 BUILD_ARCH: i386
IS_HASSIO: "YES" IS_HASSIO: "YES"
RELEASE: "YES" RELEASE: "YES"
#i386-dev-docker: i386-dev-docker:
# <<: *dev <<: *dev
# variables: variables:
# BUILD_ARCH: i386 BUILD_ARCH: i386
# DEV: "YES" DEV: "YES"
# IS_HASSIO: "NO" IS_HASSIO: "NO"
#i386-dev-hassio: i386-dev-hassio:
# <<: *dev <<: *dev
# variables: variables:
# BUILD_ARCH: i386 BUILD_ARCH: i386
# DEV: "YES" DEV: "YES"
# IS_HASSIO: "YES" IS_HASSIO: "YES"
i386-latest-docker: i386-latest-docker:
<<: *latest <<: *latest
variables: variables:

5
docker/Dockerfile
View file

@ -1,10 +1,9 @@
ARG BUILD_FROM=esphome/esphome-base-amd64:1.1.0 ARG BUILD_FROM=esphome/esphome-base-amd64:1.2.1
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
COPY . . COPY . .
RUN \ RUN \
pip install --no-cache-dir --no-binary :all: -e . && \ pip2 install --no-cache-dir --no-binary :all: -e .
pip install --no-cache-dir pillow
WORKDIR /config WORKDIR /config
ENTRYPOINT ["esphome"] ENTRYPOINT ["esphome"]

11
docker/Dockerfile.hassio
View file

@ -1,15 +1,6 @@
ARG BUILD_FROM=esphome/esphome-hassio-base-amd64:1.1.0 ARG BUILD_FROM=esphome/esphome-hassio-base-amd64:1.2.1
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
RUN \
apt-get update \
&& apt-get install -y --no-install-recommends \
python-pil \
&& rm -rf \
/tmp/* \
/var/{cache,log}/* \
/var/lib/apt/lists/*
# Copy root filesystem # Copy root filesystem
COPY docker/rootfs/ / COPY docker/rootfs/ /
COPY setup.py setup.cfg MANIFEST.in /opt/esphome/ COPY setup.py setup.cfg MANIFEST.in /opt/esphome/

4
docker/hooks/build
View file

@ -16,11 +16,11 @@ echo "PWD: $PWD"
if [[ ${IS_HASSIO} = "YES" ]]; then if [[ ${IS_HASSIO} = "YES" ]]; then
docker build \ docker build \
--build-arg "BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.1.0" \ --build-arg "BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.2.1" \
--build-arg "BUILD_VERSION=${CACHE_TAG}" \ --build-arg "BUILD_VERSION=${CACHE_TAG}" \
-t "${IMAGE_NAME}" -f ../docker/Dockerfile.hassio .. -t "${IMAGE_NAME}" -f ../docker/Dockerfile.hassio ..
else else
docker build \ docker build \
--build-arg "BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.1.0" \ --build-arg "BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.2.1" \
-t "${IMAGE_NAME}" -f ../docker/Dockerfile .. -t "${IMAGE_NAME}" -f ../docker/Dockerfile ..
fi fi