From eea4b439b0b3db5551a7fde2dc89b674e51f7647 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Fri, 22 Jul 2022 01:41:56 -0700 Subject: [PATCH] initial build (#21095) --- .github/workflows/docker_img.yaml | 6 ------ .../docker/images/chip-build-crosscompile/Dockerfile | 2 +- integrations/docker/images/chip-build-doxygen/Dockerfile | 8 ++++---- .../docker/images/chip-build-esp32-qemu/Dockerfile | 4 +--- integrations/docker/images/chip-build-esp32/Dockerfile | 2 +- integrations/docker/images/chip-build-imx/Dockerfile | 2 +- integrations/docker/images/chip-build-k32w/Dockerfile | 3 +-- integrations/docker/images/chip-build-mbed-os/Dockerfile | 2 +- .../docker/images/chip-build-nrf-platform/Dockerfile | 2 +- integrations/docker/images/chip-build-telink/Dockerfile | 2 +- integrations/docker/images/chip-build-ti/Dockerfile | 2 +- integrations/docker/images/chip-build-tizen/Dockerfile | 4 ++-- integrations/docker/images/chip-build-vscode/Dockerfile | 2 -- 13 files changed, 15 insertions(+), 26 deletions(-) diff --git a/.github/workflows/docker_img.yaml b/.github/workflows/docker_img.yaml index 9ea7ae9c7ea06a..b706dbcac39e42 100644 --- a/.github/workflows/docker_img.yaml +++ b/.github/workflows/docker_img.yaml @@ -65,9 +65,3 @@ jobs: run: | cd integrations/docker/images/chip-build${{ matrix.img }} ./build.sh --latest - - name: Scan for vulnerabilities - uses: crazy-max/docker-scan-action@master - with: - # NOTE: This task validates the images built previously with latest tag - image: connectedhomeip/chip-build${{ matrix.img }}:latest - annotations: true diff --git a/integrations/docker/images/chip-build-crosscompile/Dockerfile b/integrations/docker/images/chip-build-crosscompile/Dockerfile index 7bed01556f202b..59e023ea16f688 100644 --- a/integrations/docker/images/chip-build-crosscompile/Dockerfile +++ b/integrations/docker/images/chip-build-crosscompile/Dockerfile @@ -4,7 +4,7 @@ FROM connectedhomeip/chip-build:${VERSION} as build RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ - git=1:2.25.1-1ubuntu3.4 \ + git \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line diff --git a/integrations/docker/images/chip-build-doxygen/Dockerfile b/integrations/docker/images/chip-build-doxygen/Dockerfile index 81fa1a7255364f..f9bff774d696b5 100644 --- a/integrations/docker/images/chip-build-doxygen/Dockerfile +++ b/integrations/docker/images/chip-build-doxygen/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.15 RUN apk --no-cache add \ - doxygen=1.9.2-r1 \ - graphviz=2.49.3-r0 \ - bash=5.1.16-r0 \ - git=2.34.2-r0 + doxygen=1.9.2-r1 \ + graphviz=2.49.3-r0 \ + bash \ + git diff --git a/integrations/docker/images/chip-build-esp32-qemu/Dockerfile b/integrations/docker/images/chip-build-esp32-qemu/Dockerfile index ea4ad647a8651c..6e69acf7f72478 100644 --- a/integrations/docker/images/chip-build-esp32-qemu/Dockerfile +++ b/integrations/docker/images/chip-build-esp32-qemu/Dockerfile @@ -4,9 +4,7 @@ FROM connectedhomeip/chip-build-esp32:${VERSION} RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ - ninja-build=1.10.0-1build1 \ - git=1:2.25.1-1ubuntu3.4 \ - libgcrypt20-dev=1.8.5-5ubuntu1.1 \ + ninja-build git libgcrypt20-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line diff --git a/integrations/docker/images/chip-build-esp32/Dockerfile b/integrations/docker/images/chip-build-esp32/Dockerfile index 9837ededf21b55..925fa68b03936b 100644 --- a/integrations/docker/images/chip-build-esp32/Dockerfile +++ b/integrations/docker/images/chip-build-esp32/Dockerfile @@ -4,7 +4,7 @@ FROM connectedhomeip/chip-build:${VERSION} as build RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ - git=1:2.25.1-1ubuntu3.4 \ + git \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line diff --git a/integrations/docker/images/chip-build-imx/Dockerfile b/integrations/docker/images/chip-build-imx/Dockerfile index 8acc03833f9fec..815d3512d907e9 100644 --- a/integrations/docker/images/chip-build-imx/Dockerfile +++ b/integrations/docker/images/chip-build-imx/Dockerfile @@ -3,7 +3,7 @@ FROM connectedhomeip/chip-build:${VERSION} as build RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ - wget=1.20.3-1ubuntu2 \ + wget \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line diff --git a/integrations/docker/images/chip-build-k32w/Dockerfile b/integrations/docker/images/chip-build-k32w/Dockerfile index 8a2887b6afe804..ba925821566384 100644 --- a/integrations/docker/images/chip-build-k32w/Dockerfile +++ b/integrations/docker/images/chip-build-k32w/Dockerfile @@ -4,8 +4,7 @@ FROM connectedhomeip/chip-build:${VERSION} as build RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ - wget=1.20.3-1ubuntu2 \ - unzip=6.0-25ubuntu1 \ + wget unzip \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line diff --git a/integrations/docker/images/chip-build-mbed-os/Dockerfile b/integrations/docker/images/chip-build-mbed-os/Dockerfile index ee47fc681eeb89..459bca5d6bdf38 100644 --- a/integrations/docker/images/chip-build-mbed-os/Dockerfile +++ b/integrations/docker/images/chip-build-mbed-os/Dockerfile @@ -4,7 +4,7 @@ FROM connectedhomeip/chip-build:${VERSION} as build RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ - wget=1.20.3-1ubuntu2 \ + wget \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line diff --git a/integrations/docker/images/chip-build-nrf-platform/Dockerfile b/integrations/docker/images/chip-build-nrf-platform/Dockerfile index 4c8009bbb11cc1..633a921f4d58e1 100644 --- a/integrations/docker/images/chip-build-nrf-platform/Dockerfile +++ b/integrations/docker/images/chip-build-nrf-platform/Dockerfile @@ -7,7 +7,7 @@ ARG NCS_REVISION=fd5905aa6b04febd99d00dba6c482ac25eb15222 RUN set -x \ && apt-get update \ && apt-get install --no-install-recommends -fy \ - curl=7.68.0-1ubuntu2.11 \ + curl \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line diff --git a/integrations/docker/images/chip-build-telink/Dockerfile b/integrations/docker/images/chip-build-telink/Dockerfile index 508226089c0401..ee30de2e28abb4 100644 --- a/integrations/docker/images/chip-build-telink/Dockerfile +++ b/integrations/docker/images/chip-build-telink/Dockerfile @@ -4,7 +4,7 @@ FROM connectedhomeip/chip-build:${VERSION} as build RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ - wget=1.20.3-1ubuntu2 \ + wget \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line diff --git a/integrations/docker/images/chip-build-ti/Dockerfile b/integrations/docker/images/chip-build-ti/Dockerfile index 593b434c5a6df9..5e99fb9f44fc5a 100644 --- a/integrations/docker/images/chip-build-ti/Dockerfile +++ b/integrations/docker/images/chip-build-ti/Dockerfile @@ -4,7 +4,7 @@ FROM connectedhomeip/chip-build:${VERSION} RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ - wget=1.20.3-1ubuntu2 \ + wget \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line diff --git a/integrations/docker/images/chip-build-tizen/Dockerfile b/integrations/docker/images/chip-build-tizen/Dockerfile index 3ae8192ec138c9..13fb66e234f1db 100644 --- a/integrations/docker/images/chip-build-tizen/Dockerfile +++ b/integrations/docker/images/chip-build-tizen/Dockerfile @@ -18,8 +18,8 @@ RUN set -x \ RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ - cpio=2.13+dfsg-2 \ - obs-build=20180831-3ubuntu1 \ + cpio \ + obs-build \ openjdk-8-jre-headless \ zip \ # Cleanup diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile index 5bbad09fa8a521..77f18352c61337 100644 --- a/integrations/docker/images/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/chip-build-vscode/Dockerfile @@ -41,8 +41,6 @@ COPY --from=crosscompile /opt/ubuntu-21.04-aarch64-sysroot /opt/ubuntu-21.04-aar COPY --from=ameba /opt/ameba /opt/ameba -COPY --from=k32w /opt/sdk/sdks /opt/sdk/sdks - COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland COPY --from=ti /opt/ti/sysconfig_1.11.0 /opt/ti/sysconfig_1.11.0