Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-22 11:47:30 +01:00
Code Issues Projects Releases Wiki Activity

Update Dockerfiles

Browse Source
This commit is contained in:
Otto Winter 2018-06-03 23:45:29 +02:00
parent 17798dee1e
commit 419c5afe27
No known key found for this signature in database
GPG Key ID: DB66C0BE6013F97E
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
esphomeyaml-edge/Dockerfile
View File

@ -30,11 +30,11 @@ RUN /bin/bash -c "if [[ '$BUILD_FROM' = *\"ubuntu\"* ]]; then \
# * On alpine, only install ESP8266 toolchain # * On alpine, only install ESP8266 toolchain
COPY platformio.ini /pio/platformio.ini COPY platformio.ini /pio/platformio.ini
RUN /bin/bash -c "if [[ '$BUILD_FROM' = *\"ubuntu\"* ]]; then \ RUN /bin/bash -c "if [[ '$BUILD_FROM' = *\"ubuntu\"* ]]; then \
platformio run -e espressif32 -e espressif8266 -d /pio; \ platformio run -e espressif32 -e espressif8266 -d /pio; exit 0; \
else \ else \
echo \"\$(head -8 /pio/platformio.ini)\" >/pio/platformio.ini; \ echo \"\$(head -8 /pio/platformio.ini)\" >/pio/platformio.ini; \
platformio run -e espressif8266 -d /pio; \ platformio run -e espressif8266 -d /pio; exit 0; \
fi"; rm -rf /pio fi"
# Install latest esphomeyaml from git # Install latest esphomeyaml from git
RUN pip install --no-cache-dir \ RUN pip install --no-cache-dir \

10
esphomeyaml/Dockerfile
View File

@ -31,16 +31,14 @@ RUN /bin/bash -c "if [[ '$BUILD_FROM' = *\"ubuntu\"* ]]; then \
# * On alpine, only install ESP8266 toolchain # * On alpine, only install ESP8266 toolchain
COPY platformio.ini /pio/platformio.ini COPY platformio.ini /pio/platformio.ini
RUN /bin/bash -c "if [[ '$BUILD_FROM' = *\"ubuntu\"* ]]; then \ RUN /bin/bash -c "if [[ '$BUILD_FROM' = *\"ubuntu\"* ]]; then \
platformio run -e espressif32 -e espressif8266 -d /pio; \ platformio run -e espressif32 -e espressif8266 -d /pio; exit 0; \
else \ else \
echo \"\$(head -8 /pio/platformio.ini)\" >/pio/platformio.ini; \ echo \"\$(head -8 /pio/platformio.ini)\" >/pio/platformio.ini; \
platformio run -e espressif8266 -d /pio; \ platformio run -e espressif8266 -d /pio; exit 0; \
fi"; rm -rf /pio fi"
# Install latest esphomeyaml from git # Install latest esphomeyaml from git
RUN pip install --no-cache-dir \ RUN pip install --no-cache-dir \
esphomeyaml==${BUILD_VERSION} \ esphomeyaml==${BUILD_VERSION}
tornado \
esptool
CMD ["esphomeyaml", "/config/esphomeyaml", "dashboard"] CMD ["esphomeyaml", "/config/esphomeyaml", "dashboard"]