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

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
4 changed files with 86 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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}
COPY . .
RUN \
pip install --no-cache-dir --no-binary :all: -e . && \
pip install --no-cache-dir pillow
pip2 install --no-cache-dir --no-binary :all: -e .
WORKDIR /config
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}
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 docker/rootfs/ /
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
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}" \
-t "${IMAGE_NAME}" -f ../docker/Dockerfile.hassio ..
else
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 ..
fi