From a8d87a1fee5d9ec7bea81cd6e65d8ec7babfbde4 Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Thu, 14 Feb 2019 16:07:28 +0100 Subject: [PATCH] Update to 1.1.0 docker base image --- .gitlab-ci.yml | 22 ++-------------------- docker/Dockerfile | 2 +- docker/Dockerfile.hassio | 2 +- docker/hooks/build | 4 ++-- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8969fd9b05..579ac8a58e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,11 +41,11 @@ stages: - | if [[ "${IS_HASSIO}" == "YES" ]]; then - BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.0.0 + BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.1.0 BUILD_TO=esphome/esphome-hassio-${BUILD_ARCH} DOCKERFILE=docker/Dockerfile.hassio else - BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.0.0 + BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.1.0 if [[ "${BUILD_ARCH}" == "amd64" ]]; then BUILD_TO=esphome/esphome else @@ -183,14 +183,12 @@ aarch64-beta-hassio: variables: BETA: "YES" BUILD_ARCH: aarch64 - BUILD_FROM: esphome/esphome-hassio-base-aarch64:1.0.0 RELEASE: "YES" IS_HASSIO: "YES" #aarch64-dev-hassio: # <<: *dev # variables: # BUILD_ARCH: aarch64 -# BUILD_FROM: esphome/esphome-hassio-base-aarch64:1.0.0 # DEV: "YES" # IS_HASSIO: "YES" aarch64-latest-hassio: @@ -198,7 +196,6 @@ aarch64-latest-hassio: variables: BETA: "YES" BUILD_ARCH: aarch64 - BUILD_FROM: esphome/esphome-hassio-base-aarch64:1.0.0 IS_HASSIO: "YES" LATEST: "YES" RELEASE: "YES" @@ -207,7 +204,6 @@ amd64-beta-docker: variables: BETA: "YES" BUILD_ARCH: amd64 - BUILD_FROM: esphome/esphome-hassio-base-amd64:1.0.0 IS_HASSIO: "NO" RELEASE: "YES" amd64-beta-hassio: @@ -215,21 +211,18 @@ amd64-beta-hassio: variables: BETA: "YES" BUILD_ARCH: amd64 - BUILD_FROM: esphome/esphome-hassio-base-amd64:1.0.0 IS_HASSIO: "YES" RELEASE: "YES" #amd64-dev-docker: # <<: *dev # variables: # BUILD_ARCH: amd64 -# BUILD_FROM: esphome/esphome-base-amd64:1.0.0 # DEV: "YES" # IS_HASSIO: "NO" #amd64-dev-hassio: # <<: *dev # variables: # BUILD_ARCH: amd64 -# BUILD_FROM: esphome/esphome-hassio-base-amd64:1.0.0 # DEV: "YES" # IS_HASSIO: "YES" amd64-latest-docker: @@ -237,7 +230,6 @@ amd64-latest-docker: variables: BETA: "YES" BUILD_ARCH: amd64 - BUILD_FROM: esphome/esphome-hassio-base-amd64:1.0.0 IS_HASSIO: "NO" LATEST: "YES" RELEASE: "YES" @@ -246,7 +238,6 @@ amd64-latest-hassio: variables: BETA: "YES" BUILD_ARCH: amd64 - BUILD_FROM: esphome/esphome-hassio-base-amd64:1.0.0 IS_HASSIO: "YES" LATEST: "YES" RELEASE: "YES" @@ -255,14 +246,12 @@ armhf-beta-hassio: variables: BETA: "YES" BUILD_ARCH: armhf - BUILD_FROM: esphome/esphome-hassio-base-armhf:1.0.0 IS_HASSIO: "YES" RELEASE: "YES" #armhf-dev-hassio: # <<: *dev # variables: # BUILD_ARCH: armhf -# BUILD_FROM: esphome/esphome-hassio-base-armhf:1.0.0 # DEV: "YES" # IS_HASSIO: "YES" armhf-latest-hassio: @@ -270,7 +259,6 @@ armhf-latest-hassio: variables: BETA: "YES" BUILD_ARCH: armhf - BUILD_FROM: esphome/esphome-hassio-base-armhf:1.0.0 IS_HASSIO: "YES" LATEST: "YES" RELEASE: "YES" @@ -279,7 +267,6 @@ i386-beta-docker: variables: BETA: "YES" BUILD_ARCH: i386 - BUILD_FROM: esphome/esphome-hassio-base-i386:1.0.0 IS_HASSIO: "NO" RELEASE: "YES" i386-beta-hassio: @@ -287,21 +274,18 @@ i386-beta-hassio: variables: BETA: "YES" BUILD_ARCH: i386 - BUILD_FROM: esphome/esphome-hassio-base-i386:1.0.0 IS_HASSIO: "YES" RELEASE: "YES" #i386-dev-docker: # <<: *dev # variables: # BUILD_ARCH: i386 -# BUILD_FROM: esphome/esphome-hassio-base-i386:1.0.0 # DEV: "YES" # IS_HASSIO: "NO" #i386-dev-hassio: # <<: *dev # variables: # BUILD_ARCH: i386 -# BUILD_FROM: esphome/esphome-hassio-base-i386:1.0.0 # DEV: "YES" # IS_HASSIO: "YES" i386-latest-docker: @@ -309,7 +293,6 @@ i386-latest-docker: variables: BETA: "YES" BUILD_ARCH: i386 - BUILD_FROM: esphome/esphome-hassio-base-i386:1.0.0 IS_HASSIO: "NO" LATEST: "YES" RELEASE: "YES" @@ -318,7 +301,6 @@ i386-latest-hassio: variables: BETA: "YES" BUILD_ARCH: i386 - BUILD_FROM: esphome/esphome-hassio-base-i386:1.0.0 IS_HASSIO: "YES" LATEST: "YES" RELEASE: "YES" diff --git a/docker/Dockerfile b/docker/Dockerfile index 18a9232787..fa943fba5e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=esphome/esphome-base-amd64:1.0.0 +ARG BUILD_FROM=esphome/esphome-base-amd64:1.1.0 FROM ${BUILD_FROM} COPY . . diff --git a/docker/Dockerfile.hassio b/docker/Dockerfile.hassio index 4f90b14245..fa3f85011b 100644 --- a/docker/Dockerfile.hassio +++ b/docker/Dockerfile.hassio @@ -1,4 +1,4 @@ -ARG BUILD_FROM=esphome/esphome-hassio-base-amd64:1.0.0 +ARG BUILD_FROM=esphome/esphome-hassio-base-amd64:1.1.0 FROM ${BUILD_FROM} RUN \ diff --git a/docker/hooks/build b/docker/hooks/build index 5272804342..3e37d54ad1 100755 --- a/docker/hooks/build +++ b/docker/hooks/build @@ -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.0.0" \ + --build-arg "BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.1.0" \ --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.0.0" \ + --build-arg "BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.1.0" \ -t "${IMAGE_NAME}" -f ../docker/Dockerfile .. fi