Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-10 17:27:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Upgrade docker base image to 2.1.0

Browse source
This commit is contained in:
Otto Winter 2020-06-05 11:34:51 +02:00
parent 310e2a0b20
commit aae4b2ea5d
No known key found for this signature in database
GPG key ID: 48ED2DDB96D7682C
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -3,7 +3,7 @@
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://docker:2375/ DOCKER_HOST: tcp://docker:2375/
BASE_VERSION: '2.0.1' BASE_VERSION: '2.1.0'
TZ: UTC TZ: UTC
stages: stages:
@ -33,7 +33,7 @@ stages:
- docker info - docker info
- docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD" - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
script: script:
- docker run --rm --privileged multiarch/qemu-user-static:4.1.0-1 --reset -p yes - docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
- TAG="${CI_COMMIT_TAG#v}" - TAG="${CI_COMMIT_TAG#v}"
- TAG="${TAG:-${CI_COMMIT_SHA:0:7}}" - TAG="${TAG:-${CI_COMMIT_SHA:0:7}}"
- echo "Tag ${TAG}" - echo "Tag ${TAG}"

2
docker/Dockerfile
View file

@ -1,4 +1,4 @@
ARG BUILD_FROM=esphome/esphome-base-amd64:2.0.1 ARG BUILD_FROM=esphome/esphome-base-amd64:2.1.0
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
COPY . . COPY . .

2
docker/Dockerfile.lint
View file

@ -1,4 +1,4 @@
FROM esphome/esphome-base-amd64:2.0.1 FROM esphome/esphome-base-amd64:2.1.0
RUN \ RUN \
apt-get update \ apt-get update \