From af0cc195b7dd000e7a82df6ccbaabc0ce245a665 Mon Sep 17 00:00:00 2001 From: Jonas Bergler Date: Mon, 27 Apr 2020 12:03:55 +1200 Subject: [PATCH] Fix Dockerfile.dev home-assistant/core#34654 broke the dev dockerfile, so I'm trying to fix it. - fix the leading && by putting a valid no-op command before it to maintain formatting - remove the apt-add-repository, it's unclear why it was added and it's broken. - also add a CI step that tries to build the dockerfile to validate it. --- Dockerfile.dev | 6 +++--- azure-pipelines-ci.yml | 11 ++++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index 40f281b95ebd2f..0eb9c42c11d914 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,10 +1,10 @@ FROM python:3.8 -RUN \ +RUN true \ && apt-get update && apt-get install -y --no-install-recommends \ software-properties-common \ - && add-apt-repository ppa:jonathonf/ffmpeg-4 \ - && apt-get update && apt-get install -y --no-install-recommends \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ libudev-dev \ libavformat-dev \ libavcodec-dev \ diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml index d620cd14594237..d9b9f9a3d2d7c5 100644 --- a/azure-pipelines-ci.yml +++ b/azure-pipelines-ci.yml @@ -121,7 +121,16 @@ stages: . venv/bin/activate pre-commit run black --all-files --show-diff-on-failure displayName: "Check Black formatting" - + - job: "ValidateDockerfiles" + pool: + vmImage: "ubuntu-latest" + steps: + - task: Docker@2 + displayName: Build Dockerfile.dev + inputs: + repository: homeassistant-dev + command: build + Dockerfile: Dockerfile.dev - stage: "Tests" dependsOn: - "Overview"