Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-25 12:15:33 +01:00
Code Issues Projects Releases Wiki Activity

Update to 1.1.0 docker base image

Browse Source
This commit is contained in:
Otto Winter 2019-02-14 16:07:28 +01:00
parent a66ed437d6
commit a8d87a1fee
No known key found for this signature in database
GPG Key ID: DB66C0BE6013F97E
4 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.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.0.0 BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.1.0
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.0.0 BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.1.0
if [[ "${BUILD_ARCH}" == "amd64" ]]; then if [[ "${BUILD_ARCH}" == "amd64" ]]; then
BUILD_TO=esphome/esphome BUILD_TO=esphome/esphome
else else
@ -183,14 +183,12 @@ aarch64-beta-hassio:
variables: variables:
BETA: "YES" BETA: "YES"
BUILD_ARCH: aarch64 BUILD_ARCH: aarch64
BUILD_FROM: esphome/esphome-hassio-base-aarch64:1.0.0
RELEASE: "YES" RELEASE: "YES"
IS_HASSIO: "YES" IS_HASSIO: "YES"
#aarch64-dev-hassio: #aarch64-dev-hassio:
# <<: *dev # <<: *dev
# variables: # variables:
# BUILD_ARCH: aarch64 # BUILD_ARCH: aarch64
# BUILD_FROM: esphome/esphome-hassio-base-aarch64:1.0.0
# DEV: "YES" # DEV: "YES"
# IS_HASSIO: "YES" # IS_HASSIO: "YES"
aarch64-latest-hassio: aarch64-latest-hassio:
@ -198,7 +196,6 @@ aarch64-latest-hassio:
variables: variables:
BETA: "YES" BETA: "YES"
BUILD_ARCH: aarch64 BUILD_ARCH: aarch64
BUILD_FROM: esphome/esphome-hassio-base-aarch64:1.0.0
IS_HASSIO: "YES" IS_HASSIO: "YES"
LATEST: "YES" LATEST: "YES"
RELEASE: "YES" RELEASE: "YES"
@ -207,7 +204,6 @@ amd64-beta-docker:
variables: variables:
BETA: "YES" BETA: "YES"
BUILD_ARCH: amd64 BUILD_ARCH: amd64
BUILD_FROM: esphome/esphome-hassio-base-amd64:1.0.0
IS_HASSIO: "NO" IS_HASSIO: "NO"
RELEASE: "YES" RELEASE: "YES"
amd64-beta-hassio: amd64-beta-hassio:
@ -215,21 +211,18 @@ amd64-beta-hassio:
variables: variables:
BETA: "YES" BETA: "YES"
BUILD_ARCH: amd64 BUILD_ARCH: amd64
BUILD_FROM: esphome/esphome-hassio-base-amd64:1.0.0
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
# BUILD_FROM: esphome/esphome-base-amd64:1.0.0
# 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
# BUILD_FROM: esphome/esphome-hassio-base-amd64:1.0.0
# DEV: "YES" # DEV: "YES"
# IS_HASSIO: "YES" # IS_HASSIO: "YES"
amd64-latest-docker: amd64-latest-docker:
@ -237,7 +230,6 @@ amd64-latest-docker:
variables: variables:
BETA: "YES" BETA: "YES"
BUILD_ARCH: amd64 BUILD_ARCH: amd64
BUILD_FROM: esphome/esphome-hassio-base-amd64:1.0.0
IS_HASSIO: "NO" IS_HASSIO: "NO"
LATEST: "YES" LATEST: "YES"
RELEASE: "YES" RELEASE: "YES"
@ -246,7 +238,6 @@ amd64-latest-hassio:
variables: variables:
BETA: "YES" BETA: "YES"
BUILD_ARCH: amd64 BUILD_ARCH: amd64
BUILD_FROM: esphome/esphome-hassio-base-amd64:1.0.0
IS_HASSIO: "YES" IS_HASSIO: "YES"
LATEST: "YES" LATEST: "YES"
RELEASE: "YES" RELEASE: "YES"
@ -255,14 +246,12 @@ armhf-beta-hassio:
variables: variables:
BETA: "YES" BETA: "YES"
BUILD_ARCH: armhf BUILD_ARCH: armhf
BUILD_FROM: esphome/esphome-hassio-base-armhf:1.0.0
IS_HASSIO: "YES" IS_HASSIO: "YES"
RELEASE: "YES" RELEASE: "YES"
#armhf-dev-hassio: #armhf-dev-hassio:
# <<: *dev # <<: *dev
# variables: # variables:
# BUILD_ARCH: armhf # BUILD_ARCH: armhf
# BUILD_FROM: esphome/esphome-hassio-base-armhf:1.0.0
# DEV: "YES" # DEV: "YES"
# IS_HASSIO: "YES" # IS_HASSIO: "YES"
armhf-latest-hassio: armhf-latest-hassio:
@ -270,7 +259,6 @@ armhf-latest-hassio:
variables: variables:
BETA: "YES" BETA: "YES"
BUILD_ARCH: armhf BUILD_ARCH: armhf
BUILD_FROM: esphome/esphome-hassio-base-armhf:1.0.0
IS_HASSIO: "YES" IS_HASSIO: "YES"
LATEST: "YES" LATEST: "YES"
RELEASE: "YES" RELEASE: "YES"
@ -279,7 +267,6 @@ i386-beta-docker:
variables: variables:
BETA: "YES" BETA: "YES"
BUILD_ARCH: i386 BUILD_ARCH: i386
BUILD_FROM: esphome/esphome-hassio-base-i386:1.0.0
IS_HASSIO: "NO" IS_HASSIO: "NO"
RELEASE: "YES" RELEASE: "YES"
i386-beta-hassio: i386-beta-hassio:
@ -287,21 +274,18 @@ i386-beta-hassio:
variables: variables:
BETA: "YES" BETA: "YES"
BUILD_ARCH: i386 BUILD_ARCH: i386
BUILD_FROM: esphome/esphome-hassio-base-i386:1.0.0
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
# BUILD_FROM: esphome/esphome-hassio-base-i386:1.0.0
# 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
# BUILD_FROM: esphome/esphome-hassio-base-i386:1.0.0
# DEV: "YES" # DEV: "YES"
# IS_HASSIO: "YES" # IS_HASSIO: "YES"
i386-latest-docker: i386-latest-docker:
@ -309,7 +293,6 @@ i386-latest-docker:
variables: variables:
BETA: "YES" BETA: "YES"
BUILD_ARCH: i386 BUILD_ARCH: i386
BUILD_FROM: esphome/esphome-hassio-base-i386:1.0.0
IS_HASSIO: "NO" IS_HASSIO: "NO"
LATEST: "YES" LATEST: "YES"
RELEASE: "YES" RELEASE: "YES"
@ -318,7 +301,6 @@ i386-latest-hassio:
variables: variables:
BETA: "YES" BETA: "YES"
BUILD_ARCH: i386 BUILD_ARCH: i386
BUILD_FROM: esphome/esphome-hassio-base-i386:1.0.0
IS_HASSIO: "YES" IS_HASSIO: "YES"
LATEST: "YES" LATEST: "YES"
RELEASE: "YES" RELEASE: "YES"

2
docker/Dockerfile
View File

@ -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} FROM ${BUILD_FROM}
COPY . . COPY . .

2
docker/Dockerfile.hassio
View File

@ -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} FROM ${BUILD_FROM}
RUN \ RUN \

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.0.0" \ --build-arg "BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.1.0" \
--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.0.0" \ --build-arg "BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.1.0" \
-t "${IMAGE_NAME}" -f ../docker/Dockerfile .. -t "${IMAGE_NAME}" -f ../docker/Dockerfile ..
fi fi