mirror of
				https://github.com/esphome/esphome.git
				synced 2025-10-30 22:53:59 +00:00 
			
		
		
		
	Try fix docker build
This commit is contained in:
		| @@ -68,7 +68,7 @@ test: | |||||||
|         "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" |         "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" | ||||||
|     - docker push "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" |     - docker push "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" | ||||||
|     - docker push "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:dev" |     - docker push "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:dev" | ||||||
|   retry: 1 |   retry: 2 | ||||||
|  |  | ||||||
| # Generic deploy template | # Generic deploy template | ||||||
| .deploy: &deploy | .deploy: &deploy | ||||||
|   | |||||||
| @@ -19,8 +19,8 @@ RUN platformio settings set enable_telemetry No && \ | |||||||
|     platformio run -e espressif32 -e espressif8266; exit 0 |     platformio run -e espressif32 -e espressif8266; exit 0 | ||||||
|  |  | ||||||
| COPY . . | COPY . . | ||||||
| RUN pip install -e . && \ | RUN pip install --no-cache-dir -e . && \ | ||||||
|     pip install tzlocal |     pip install --no-cache-dir tzlocal | ||||||
|  |  | ||||||
| WORKDIR /config | WORKDIR /config | ||||||
| ENTRYPOINT ["esphomeyaml"] | ENTRYPOINT ["esphomeyaml"] | ||||||
|   | |||||||
| @@ -1,21 +1,21 @@ | |||||||
| # Dockerfile for aarch64 version of HassIO add-on | # Dockerfile for aarch64 version of HassIO add-on | ||||||
| FROM homeassistant/aarch64-base:latest | FROM arm64v8/ubuntu:bionic | ||||||
|  |  | ||||||
| RUN apk add --no-cache \ | RUN apt-get update && apt-get install -y --no-install-recommends \ | ||||||
|         python2 \ |         python \ | ||||||
|         py2-pip \ |         python-pip \ | ||||||
|  |         python-setuptools \ | ||||||
|  |         python-pil \ | ||||||
|         git \ |         git \ | ||||||
|         openssh \ |     && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/*rm -rf /var/lib/apt/lists/* /tmp/* && \ | ||||||
|         libc6-compat \ |  | ||||||
|     && \ |  | ||||||
|     pip install --no-cache-dir --no-binary :all: platformio && \ |     pip install --no-cache-dir --no-binary :all: platformio && \ | ||||||
|     platformio settings set enable_telemetry No |     platformio settings set enable_telemetry No | ||||||
|  |  | ||||||
| COPY docker/platformio-esp8266.ini /pio/platformio.ini | COPY docker/platformio.ini /pio/platformio.ini | ||||||
| RUN platformio run -d /pio; rm -rf /pio | RUN platformio run -d /pio; rm -rf /pio | ||||||
|  |  | ||||||
| COPY . . | COPY . . | ||||||
| RUN pip install --no-cache-dir --no-binary :all: -e . && \ | RUN pip install --no-cache-dir --no-binary :all: -e . && \ | ||||||
|     pip install --no-cache-dir --no-binary :all: pillow tzlocal |     pip install --no-cache-dir --no-binary :all: tzlocal | ||||||
|  |  | ||||||
| CMD ["esphomeyaml", "/config/esphomeyaml", "dashboard"] | CMD ["esphomeyaml", "/config/esphomeyaml", "dashboard"] | ||||||
|   | |||||||
| @@ -3,8 +3,10 @@ FROM homeassistant/armhf-base:latest | |||||||
|  |  | ||||||
| RUN apk add --no-cache \ | RUN apk add --no-cache \ | ||||||
|         python2 \ |         python2 \ | ||||||
|  |         python2-dev \ | ||||||
|         py2-pip \ |         py2-pip \ | ||||||
|         git \ |         git \ | ||||||
|  |         gcc \ | ||||||
|         openssh \ |         openssh \ | ||||||
|         libc6-compat \ |         libc6-compat \ | ||||||
|         jpeg-dev \ |         jpeg-dev \ | ||||||
| @@ -13,6 +15,8 @@ RUN apk add --no-cache \ | |||||||
|         lcms2-dev \ |         lcms2-dev \ | ||||||
|         openjpeg-dev \ |         openjpeg-dev \ | ||||||
|         tiff-dev \ |         tiff-dev \ | ||||||
|  |         libc-dev \ | ||||||
|  |         linux-headers \ | ||||||
|     && \ |     && \ | ||||||
|     pip install --no-cache-dir --no-binary :all: platformio && \ |     pip install --no-cache-dir --no-binary :all: platformio && \ | ||||||
|     platformio settings set enable_telemetry No |     platformio settings set enable_telemetry No | ||||||
| @@ -22,6 +26,6 @@ RUN platformio run -d /pio; rm -rf /pio | |||||||
|  |  | ||||||
| COPY . . | COPY . . | ||||||
| RUN pip install --no-cache-dir --no-binary :all: -e . && \ | RUN pip install --no-cache-dir --no-binary :all: -e . && \ | ||||||
|     pip install --no-cache-dir pilow tzlocal |     pip install --no-cache-dir pillow tzlocal | ||||||
|  |  | ||||||
| CMD ["esphomeyaml", "/config/esphomeyaml", "dashboard"] | CMD ["esphomeyaml", "/config/esphomeyaml", "dashboard"] | ||||||
|   | |||||||
| @@ -21,8 +21,10 @@ RUN /bin/bash -c "if [[ '$BUILD_FROM' = *\"ubuntu\"* ]]; then \ | |||||||
|     else \ |     else \ | ||||||
|        apk add --no-cache \ |        apk add --no-cache \ | ||||||
|           python2 \ |           python2 \ | ||||||
|  |           python2-dev \ | ||||||
|           py2-pip \ |           py2-pip \ | ||||||
|           git \ |           git \ | ||||||
|  |           gcc \ | ||||||
|           openssh \ |           openssh \ | ||||||
|           libc6-compat \ |           libc6-compat \ | ||||||
|           jpeg-dev \ |           jpeg-dev \ | ||||||
| @@ -30,7 +32,9 @@ RUN /bin/bash -c "if [[ '$BUILD_FROM' = *\"ubuntu\"* ]]; then \ | |||||||
|           freetype-dev \ |           freetype-dev \ | ||||||
|           lcms2-dev \ |           lcms2-dev \ | ||||||
|           openjpeg-dev \ |           openjpeg-dev \ | ||||||
|           tiff-dev; \ |           tiff-dev \ | ||||||
|  |           libc-dev \ | ||||||
|  |           linux-headers; \ | ||||||
|     fi" && \ |     fi" && \ | ||||||
|     pip install --no-cache-dir platformio && \ |     pip install --no-cache-dir platformio && \ | ||||||
|     platformio settings set enable_telemetry No |     platformio settings set enable_telemetry No | ||||||
| @@ -50,6 +54,6 @@ RUN /bin/bash -c "if [[ '$BUILD_FROM' = *\"ubuntu\"* ]]; then \ | |||||||
| # Install latest esphomeyaml from git | # Install latest esphomeyaml from git | ||||||
| RUN pip install --no-cache-dir \ | RUN pip install --no-cache-dir \ | ||||||
|       git+git://github.com/OttoWinter/esphomeyaml.git && \ |       git+git://github.com/OttoWinter/esphomeyaml.git && \ | ||||||
|     pip install pillow tzlocal |     pip install --no-cache-dir pillow tzlocal | ||||||
|  |  | ||||||
| CMD ["esphomeyaml", "/config/esphomeyaml", "dashboard"] | CMD ["esphomeyaml", "/config/esphomeyaml", "dashboard"] | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| { | { | ||||||
|     "squash": false, |     "squash": false, | ||||||
|     "build_from": { |     "build_from": { | ||||||
|         "aarch64": "homeassistant/aarch64-base:latest", |         "aarch64": "arm64v8/ubuntu:bionic", | ||||||
|         "amd64": "ubuntu:bionic", |         "amd64": "ubuntu:bionic", | ||||||
|         "armhf": "homeassistant/armhf-base:latest", |         "armhf": "homeassistant/armhf-base:latest", | ||||||
|         "i386": "i386/ubuntu:bionic" |         "i386": "i386/ubuntu:bionic" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user