From 600d1ea4a22f99f78764389fec354f64ddf66719 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 16 Oct 2023 11:24:30 -0400 Subject: [PATCH 1/9] Use latest docker version everywhere --- .devcontainer/devcontainer.json | 2 +- .github/workflows/bloat_check.yaml | 2 +- .github/workflows/build.yaml | 8 ++++---- .github/workflows/chef.yaml | 8 ++++---- .github/workflows/cirque.yaml | 2 +- .github/workflows/doxygen.yaml | 2 +- .github/workflows/examples-ameba.yaml | 2 +- .github/workflows/examples-asr.yaml | 2 +- .github/workflows/examples-bouffalolab.yaml | 2 +- .github/workflows/examples-cc13x2x7_26x2x7.yaml | 2 +- .github/workflows/examples-cc32xx.yaml | 2 +- .github/workflows/examples-efr32.yaml | 2 +- .github/workflows/examples-esp32.yaml | 4 ++-- .github/workflows/examples-infineon.yaml | 2 +- .github/workflows/examples-k32w.yaml | 2 +- .github/workflows/examples-linux-arm.yaml | 2 +- .github/workflows/examples-linux-imx.yaml | 2 +- .github/workflows/examples-linux-standalone.yaml | 2 +- .github/workflows/examples-mbed.yaml | 2 +- .github/workflows/examples-mw320.yaml | 2 +- .github/workflows/examples-nrfconnect.yaml | 2 +- .github/workflows/examples-openiotsdk.yaml | 2 +- .github/workflows/examples-qpg.yaml | 2 +- .github/workflows/examples-stm32.yaml | 2 +- .github/workflows/examples-telink.yaml | 2 +- .github/workflows/examples-tizen.yaml | 2 +- .github/workflows/fuzzing-build.yaml | 2 +- .github/workflows/java-tests.yaml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/minimal-build.yaml | 2 +- .github/workflows/qemu.yaml | 4 ++-- .github/workflows/release_artifacts.yaml | 4 ++-- .github/workflows/tests.yaml | 4 ++-- .github/workflows/unit_integration_test.yaml | 2 +- .github/workflows/zap_regeneration.yaml | 2 +- .github/workflows/zap_templates.yaml | 2 +- examples/air-quality-sensor-app/telink/README.md | 2 +- examples/all-clusters-app/ameba/README.md | 4 ++-- examples/all-clusters-app/telink/Readme.md | 2 +- examples/all-clusters-minimal-app/ameba/README.md | 4 ++-- examples/all-clusters-minimal-app/telink/Readme.md | 2 +- examples/bridge-app/linux/Dockerfile | 2 +- examples/bridge-app/telink/README.md | 2 +- examples/chef/README.md | 6 +++--- examples/chip-tool/Dockerfile | 2 +- examples/contact-sensor-app/telink/README.md | 2 +- examples/light-switch-app/ameba/README.md | 4 ++-- examples/light-switch-app/telink/README.md | 2 +- examples/lighting-app/ameba/README.md | 4 ++-- examples/lighting-app/linux/Dockerfile | 2 +- examples/lighting-app/telink/README.md | 2 +- examples/lock-app/telink/README.md | 2 +- examples/ota-requestor-app/ameba/README.md | 4 ++-- examples/ota-requestor-app/telink/Readme.md | 2 +- examples/pigweed-app/ameba/README.md | 4 ++-- examples/pump-app/telink/README.md | 2 +- examples/pump-controller-app/telink/README.md | 2 +- examples/resource-monitoring-app/linux/Dockerfile | 2 +- examples/resource-monitoring-app/telink/README.md | 2 +- examples/shell/telink/README.md | 2 +- examples/smoke-co-alarm-app/telink/README.md | 2 +- examples/temperature-measurement-app/telink/README.md | 2 +- examples/thermostat/telink/Readme.md | 2 +- examples/window-app/telink/README.md | 2 +- .../images/stage-1/chip-build-crosscompile/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-ameba/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-asr/Dockerfile | 2 +- .../images/stage-2/chip-build-bouffalolab/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-cirque/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-efr32/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-esp32/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-imx/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-infineon/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-java/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-k32w/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-mbed-os/Dockerfile | 2 +- .../images/stage-2/chip-build-nrf-platform/Dockerfile | 2 +- .../images/stage-2/chip-build-openiotsdk/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-telink/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-ti/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-tizen/Dockerfile | 2 +- .../docker/images/stage-3/chip-build-android/Dockerfile | 2 +- .../images/stage-3/chip-build-esp32-qemu/Dockerfile | 2 +- .../images/stage-3/chip-build-tizen-qemu/Dockerfile | 2 +- .../docker/images/vscode/chip-build-vscode/Dockerfile | 2 +- src/test_driver/tizen/README.md | 4 ++-- 86 files changed, 105 insertions(+), 105 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f738660104089f..f33e83f87b17fa 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -14,7 +14,7 @@ "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ], - "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 1", + "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 20", "image": "matter-dev-environment:local", "remoteUser": "vscode", "customizations": { diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml index 944ecefe9a2336..faad378d35a657 100644 --- a/.github/workflows/bloat_check.yaml +++ b/.github/workflows/bloat_check.yaml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 steps: - name: Checkout diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d091dc346b9bf6..5d3adfa3bf3e16 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -40,7 +40,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -131,7 +131,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -279,7 +279,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 volumes: - "/tmp/log_output:/tmp/test_logs" options: --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -414,7 +414,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index 330118bd958cfc..7b03a66931cb60 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -33,7 +33,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 options: --user root steps: @@ -54,7 +54,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:2 + image: ghcr.io/project-chip/chip-build-esp32:20 options: --user root steps: @@ -75,7 +75,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nrf-platform:1 + image: ghcr.io/project-chip/chip-build-nrf-platform:20 options: --user root steps: @@ -96,7 +96,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-telink:16 + image: ghcr.io/project-chip/chip-build-telink:20 options: --user root steps: diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml index 94bef11c9f8999..86007a7b7aad83 100644 --- a/.github/workflows/cirque.yaml +++ b/.github/workflows/cirque.yaml @@ -40,7 +40,7 @@ jobs: # need to run with privilege, which isn't supported by job.XXX.contaner # https://github.com/actions/container-action/issues/2 # container: - # image: ghcr.io/project-chip/chip-build-cirque:0.8 + # image: ghcr.io/project-chip/chip-build-cirque:20 # volumes: # - "/tmp:/tmp" # - "/dev/pts:/dev/pts" diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml index 82d90dc86366f0..eea17e3affd5b0 100644 --- a/.github/workflows/doxygen.yaml +++ b/.github/workflows/doxygen.yaml @@ -81,7 +81,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-doxygen:1 + image: ghcr.io/project-chip/chip-build-doxygen:20 if: github.actor != 'restyled-io[bot]' diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml index 48b7cf10fcc950..672214d546cbb2 100644 --- a/.github/workflows/examples-ameba.yaml +++ b/.github/workflows/examples-ameba.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ameba:9 + image: ghcr.io/project-chip/chip-build-ameba:20 options: --user root steps: diff --git a/.github/workflows/examples-asr.yaml b/.github/workflows/examples-asr.yaml index ef7445519a25b4..6f39cfa75c001a 100644 --- a/.github/workflows/examples-asr.yaml +++ b/.github/workflows/examples-asr.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-asr:1 + image: ghcr.io/project-chip/chip-build-asr:20 options: --user root steps: diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml index 6fa03b295db295..532e1bfb963cce 100644 --- a/.github/workflows/examples-bouffalolab.yaml +++ b/.github/workflows/examples-bouffalolab.yaml @@ -35,7 +35,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-bouffalolab:1 + image: ghcr.io/project-chip/chip-build-bouffalolab:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml index cbfc1be847416a..6243ecd9f06fe5 100644 --- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml +++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ti:1 + image: ghcr.io/project-chip/chip-build-ti:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml index b208314e4160ba..336dcf1fde5e97 100644 --- a/.github/workflows/examples-cc32xx.yaml +++ b/.github/workflows/examples-cc32xx.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ti:1 + image: ghcr.io/project-chip/chip-build-ti:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index ab80a86bb1dc10..40b3bb18dbf84e 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-efr32:19 + image: ghcr.io/project-chip/chip-build-efr32:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml index a0dd03c6c65f03..084de904c7e269 100644 --- a/.github/workflows/examples-esp32.yaml +++ b/.github/workflows/examples-esp32.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:2 + image: ghcr.io/project-chip/chip-build-esp32:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" @@ -130,7 +130,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:2 + image: ghcr.io/project-chip/chip-build-esp32:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml index 371c7f39203ecd..11a904625f1903 100644 --- a/.github/workflows/examples-infineon.yaml +++ b/.github/workflows/examples-infineon.yaml @@ -35,7 +35,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-infineon:1 + image: ghcr.io/project-chip/chip-build-infineon:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml index 1f9c2f5871c8b6..21b4b4520ea028 100644 --- a/.github/workflows/examples-k32w.yaml +++ b/.github/workflows/examples-k32w.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-k32w:6 + image: ghcr.io/project-chip/chip-build-k32w:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml index 88b0ea72303973..2ec789d65a5ff7 100644 --- a/.github/workflows/examples-linux-arm.yaml +++ b/.github/workflows/examples-linux-arm.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-crosscompile:1 + image: ghcr.io/project-chip/chip-build-crosscompile:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml index 596b9416bafbcb..dae9832961b138 100644 --- a/.github/workflows/examples-linux-imx.yaml +++ b/.github/workflows/examples-linux-imx.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-imx:1 + image: ghcr.io/project-chip/chip-build-imx:20 steps: - name: Checkout diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml index a981082ffa308a..90f29da0d30ff0 100644 --- a/.github/workflows/examples-linux-standalone.yaml +++ b/.github/workflows/examples-linux-standalone.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml index 08a75943140d13..3c03d0c78c1018 100644 --- a/.github/workflows/examples-mbed.yaml +++ b/.github/workflows/examples-mbed.yaml @@ -40,7 +40,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-mbed-os:1 + image: ghcr.io/project-chip/chip-build-mbed-os:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml index 06d3239b586d43..8a0254b691f3c4 100644 --- a/.github/workflows/examples-mw320.yaml +++ b/.github/workflows/examples-mw320.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml index d980f8079d8947..757c32c02bdbde 100644 --- a/.github/workflows/examples-nrfconnect.yaml +++ b/.github/workflows/examples-nrfconnect.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nrf-platform:1 + image: ghcr.io/project-chip/chip-build-nrf-platform:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml index 7f09a2ee57bdce..a2fb61c1ceda79 100644 --- a/.github/workflows/examples-openiotsdk.yaml +++ b/.github/workflows/examples-openiotsdk.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-openiotsdk:1 + image: ghcr.io/project-chip/chip-build-openiotsdk:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" options: --privileged diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml index d9d5a85fa28234..c62c8bd18b8b38 100644 --- a/.github/workflows/examples-qpg.yaml +++ b/.github/workflows/examples-qpg.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-stm32.yaml b/.github/workflows/examples-stm32.yaml index 567a8da7d711d7..9abcbc240f0bdf 100644 --- a/.github/workflows/examples-stm32.yaml +++ b/.github/workflows/examples-stm32.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index 0f7a42d4ab8a04..04fcdb33aac8ac 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-telink:16 + image: ghcr.io/project-chip/chip-build-telink:20 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml index b0232751874a1a..84ca0651ae2ee4 100644 --- a/.github/workflows/examples-tizen.yaml +++ b/.github/workflows/examples-tizen.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-tizen:1 + image: ghcr.io/project-chip/chip-build-tizen:20 options: --user root volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml index 50a07a3b8820bb..c27928850c8f14 100644 --- a/.github/workflows/fuzzing-build.yaml +++ b/.github/workflows/fuzzing-build.yaml @@ -33,7 +33,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index 197ecbcb736326..cb4af69489425d 100644 --- a/.github/workflows/java-tests.yaml +++ b/.github/workflows/java-tests.yaml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-java:1 + image: ghcr.io/project-chip/chip-build-java:20 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5320d093400ed0..0755b8afaea2f9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -29,7 +29,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 steps: - name: Checkout diff --git a/.github/workflows/minimal-build.yaml b/.github/workflows/minimal-build.yaml index b8c3af0a88874a..b3d4790c9a86d9 100644 --- a/.github/workflows/minimal-build.yaml +++ b/.github/workflows/minimal-build.yaml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-minimal:1 + image: ghcr.io/project-chip/chip-build-minimal:20 steps: - name: Checkout diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml index e5bc7b4dede1fd..d029d3a010eaae 100644 --- a/.github/workflows/qemu.yaml +++ b/.github/workflows/qemu.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32-qemu:2 + image: ghcr.io/project-chip/chip-build-esp32-qemu:20 volumes: - "/tmp/log_output:/tmp/test_logs" @@ -76,7 +76,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-tizen-qemu:1 + image: ghcr.io/project-chip/chip-build-tizen-qemu:20 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml index 54339e0325ceae..cfb8991bd052da 100644 --- a/.github/workflows/release_artifacts.yaml +++ b/.github/workflows/release_artifacts.yaml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-esp32:2 + image: ghcr.io/project-chip/chip-build-esp32:20 steps: - name: Checkout @@ -68,7 +68,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-efr32:1 + image: ghcr.io/project-chip/chip-build-efr32:20 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 2274cd3a30872f..134a288fa2ef0e 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" @@ -402,7 +402,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0" diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml index ec1c499ee6538b..6b816198d38197 100644 --- a/.github/workflows/unit_integration_test.yaml +++ b/.github/workflows/unit_integration_test.yaml @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml index 2be032fb771b94..9910303eba3a7e 100644 --- a/.github/workflows/zap_regeneration.yaml +++ b/.github/workflows/zap_regeneration.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 defaults: run: shell: sh diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml index dcc5baf5110402..2971823a653805 100644 --- a/.github/workflows/zap_templates.yaml +++ b/.github/workflows/zap_templates.yaml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: ghcr.io/project-chip/chip-build:1 + image: ghcr.io/project-chip/chip-build:20 defaults: run: shell: sh diff --git a/examples/air-quality-sensor-app/telink/README.md b/examples/air-quality-sensor-app/telink/README.md index eecc7e8bbdbaa6..2ff062f1fb9773 100644 --- a/examples/air-quality-sensor-app/telink/README.md +++ b/examples/air-quality-sensor-app/telink/README.md @@ -9,7 +9,7 @@ You can use this example as a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md index eed2ad0142b9c9..e5cff1adfdfe4b 100644 --- a/examples/all-clusters-app/ameba/README.md +++ b/examples/all-clusters-app/ameba/README.md @@ -27,11 +27,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:9 + $ docker pull ghcr.io/project-chip/chip-build-ameba:20 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:9 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:20 - Setup build environment: diff --git a/examples/all-clusters-app/telink/Readme.md b/examples/all-clusters-app/telink/Readme.md index a8881b7fdeb024..721e736ebc80f4 100644 --- a/examples/all-clusters-app/telink/Readme.md +++ b/examples/all-clusters-app/telink/Readme.md @@ -11,7 +11,7 @@ creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/all-clusters-minimal-app/ameba/README.md b/examples/all-clusters-minimal-app/ameba/README.md index d791c1b1b4a537..044352fa323cef 100644 --- a/examples/all-clusters-minimal-app/ameba/README.md +++ b/examples/all-clusters-minimal-app/ameba/README.md @@ -27,13 +27,13 @@ The CHIP demo application is supported on - Pull docker image: ``` - $ docker pull ghcr.io/project-chip/chip-build-ameba:9 + $ docker pull ghcr.io/project-chip/chip-build-ameba:20 ``` - Run docker container: ``` - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:9 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:20 ``` - Setup build environment: diff --git a/examples/all-clusters-minimal-app/telink/Readme.md b/examples/all-clusters-minimal-app/telink/Readme.md index 53c750b806baf7..06fadb15ff9449 100644 --- a/examples/all-clusters-minimal-app/telink/Readme.md +++ b/examples/all-clusters-minimal-app/telink/Readme.md @@ -11,7 +11,7 @@ for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/bridge-app/linux/Dockerfile b/examples/bridge-app/linux/Dockerfile index f971e778349958..faa41967425f5d 100644 --- a/examples/bridge-app/linux/Dockerfile +++ b/examples/bridge-app/linux/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-cirque-device-base:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/examples/bridge-app/telink/README.md b/examples/bridge-app/telink/README.md index fd3d70c21e9b84..6a7967b90939e8 100644 --- a/examples/bridge-app/telink/README.md +++ b/examples/bridge-app/telink/README.md @@ -88,7 +88,7 @@ defined: 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/chef/README.md b/examples/chef/README.md index ab239b39a939ce..11a15261b08d97 100644 --- a/examples/chef/README.md +++ b/examples/chef/README.md @@ -101,7 +101,7 @@ relevant platform image. You can simulate the workflow locally by mounting your CHIP repo into a container and executing the CI command: ```shell -docker run -it --mount source=$(pwd),target=/workspace,type=bind ghcr.io/project-chip/chip-build-$PLATFORM:1$VERSION +docker run -it --mount source=$(pwd),target=/workspace,type=bind ghcr.io/project-chip/chip-build-$PLATFORM:$VERSION ``` In the container: @@ -128,7 +128,7 @@ chef_$PLATFORM: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-$PLATFORM:1$VERSION + image: ghcr.io/project-chip/chip-build-$PLATFORM:$VERSION options: --user root steps: @@ -183,7 +183,7 @@ command for these targets. To test your configuration locally, you may employ a similar strategy as in CI: ```shell -docker run -it --mount source=$(pwd),target=/workspace,type=bind ghcr.io/project-chip/chip-build-vscode:1$VERSION +docker run -it --mount source=$(pwd),target=/workspace,type=bind ghcr.io/project-chip/chip-build-vscode:$VERSION ``` In the container: diff --git a/examples/chip-tool/Dockerfile b/examples/chip-tool/Dockerfile index ee6c0ff62a9794..ec0b6c5f22421d 100644 --- a/examples/chip-tool/Dockerfile +++ b/examples/chip-tool/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-cirque-device-base:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/examples/contact-sensor-app/telink/README.md b/examples/contact-sensor-app/telink/README.md index cef7f3364dd7dd..60202e262caff0 100755 --- a/examples/contact-sensor-app/telink/README.md +++ b/examples/contact-sensor-app/telink/README.md @@ -9,7 +9,7 @@ You can use this example as a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/light-switch-app/ameba/README.md b/examples/light-switch-app/ameba/README.md index 65289c41a81b82..14d4e4aa92b2e3 100644 --- a/examples/light-switch-app/ameba/README.md +++ b/examples/light-switch-app/ameba/README.md @@ -26,11 +26,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:9 + $ docker pull ghcr.io/project-chip/chip-build-ameba:20 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:9 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:20 - Setup build environment: diff --git a/examples/light-switch-app/telink/README.md b/examples/light-switch-app/telink/README.md index 6dc9970c5c732e..23caebc5d0ab3f 100755 --- a/examples/light-switch-app/telink/README.md +++ b/examples/light-switch-app/telink/README.md @@ -14,7 +14,7 @@ creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/lighting-app/ameba/README.md b/examples/lighting-app/ameba/README.md index 43934484597b52..eeca656961da20 100644 --- a/examples/lighting-app/ameba/README.md +++ b/examples/lighting-app/ameba/README.md @@ -23,11 +23,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:9 + $ docker pull ghcr.io/project-chip/chip-build-ameba:20 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:9 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:20 - Setup build environment: diff --git a/examples/lighting-app/linux/Dockerfile b/examples/lighting-app/linux/Dockerfile index 73be41d186c211..7c8df8f64b5e25 100644 --- a/examples/lighting-app/linux/Dockerfile +++ b/examples/lighting-app/linux/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-cirque-device-base:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/examples/lighting-app/telink/README.md b/examples/lighting-app/telink/README.md index 666af084b2a8bf..8c1f91a4f0ed7a 100644 --- a/examples/lighting-app/telink/README.md +++ b/examples/lighting-app/telink/README.md @@ -12,7 +12,7 @@ a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/lock-app/telink/README.md b/examples/lock-app/telink/README.md index 2d8e0349d571a1..57062044de91c8 100755 --- a/examples/lock-app/telink/README.md +++ b/examples/lock-app/telink/README.md @@ -12,7 +12,7 @@ a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/ota-requestor-app/ameba/README.md b/examples/ota-requestor-app/ameba/README.md index d591080a9332a7..cc070ed27b367c 100644 --- a/examples/ota-requestor-app/ameba/README.md +++ b/examples/ota-requestor-app/ameba/README.md @@ -6,11 +6,11 @@ A prototype application that demonstrates OTA Requestor capabilities. - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:9 + $ docker pull ghcr.io/project-chip/chip-build-ameba:20 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:9 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:20 - Setup build environment: diff --git a/examples/ota-requestor-app/telink/Readme.md b/examples/ota-requestor-app/telink/Readme.md index 867f498f9df917..0afd0f02956df0 100755 --- a/examples/ota-requestor-app/telink/Readme.md +++ b/examples/ota-requestor-app/telink/Readme.md @@ -5,7 +5,7 @@ 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/pigweed-app/ameba/README.md b/examples/pigweed-app/ameba/README.md index 9198b4e1ea822a..30e1b2b1c56f9d 100644 --- a/examples/pigweed-app/ameba/README.md +++ b/examples/pigweed-app/ameba/README.md @@ -31,11 +31,11 @@ following features are available: - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:9 + $ docker pull ghcr.io/project-chip/chip-build-ameba:20 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:9 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:20 - Setup build environment: diff --git a/examples/pump-app/telink/README.md b/examples/pump-app/telink/README.md index a5a656c68adeea..63f23b9b4a6120 100755 --- a/examples/pump-app/telink/README.md +++ b/examples/pump-app/telink/README.md @@ -13,7 +13,7 @@ reference for creating your own pump application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/pump-controller-app/telink/README.md b/examples/pump-controller-app/telink/README.md index 14153386de3b5e..367ea9a0d76e69 100755 --- a/examples/pump-controller-app/telink/README.md +++ b/examples/pump-controller-app/telink/README.md @@ -14,7 +14,7 @@ your own pump application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/resource-monitoring-app/linux/Dockerfile b/examples/resource-monitoring-app/linux/Dockerfile index 78f41ab73a9897..8d1e2072082d14 100644 --- a/examples/resource-monitoring-app/linux/Dockerfile +++ b/examples/resource-monitoring-app/linux/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -ARG VERSION=1 +ARG VERSION=20 FROM connectedhomeip/chip-cirque-device-base:${VERSION} COPY out/debug/chip-resource-monitoring-app /usr/bin/ diff --git a/examples/resource-monitoring-app/telink/README.md b/examples/resource-monitoring-app/telink/README.md index 3b6645171511e0..76ae2430ec49a9 100644 --- a/examples/resource-monitoring-app/telink/README.md +++ b/examples/resource-monitoring-app/telink/README.md @@ -9,7 +9,7 @@ You can use this example as a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/shell/telink/README.md b/examples/shell/telink/README.md index 2ff00f0046473f..36c590a46aa10b 100755 --- a/examples/shell/telink/README.md +++ b/examples/shell/telink/README.md @@ -9,7 +9,7 @@ You can use this example as a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/smoke-co-alarm-app/telink/README.md b/examples/smoke-co-alarm-app/telink/README.md index f36ecb97d5925e..4dce6f247c4cfb 100755 --- a/examples/smoke-co-alarm-app/telink/README.md +++ b/examples/smoke-co-alarm-app/telink/README.md @@ -9,7 +9,7 @@ You can use this example as a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/temperature-measurement-app/telink/README.md b/examples/temperature-measurement-app/telink/README.md index fda373eedf2ca9..a045088ec95c2d 100644 --- a/examples/temperature-measurement-app/telink/README.md +++ b/examples/temperature-measurement-app/telink/README.md @@ -13,7 +13,7 @@ creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/thermostat/telink/Readme.md b/examples/thermostat/telink/Readme.md index b73e5866b03173..0e509cf4e6fd40 100755 --- a/examples/thermostat/telink/Readme.md +++ b/examples/thermostat/telink/Readme.md @@ -9,7 +9,7 @@ You can use this example as a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/window-app/telink/README.md b/examples/window-app/telink/README.md index 372dbcf8dba809..e676a85586bbdd 100644 --- a/examples/window-app/telink/README.md +++ b/examples/window-app/telink/README.md @@ -12,7 +12,7 @@ for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile b/integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile index 8767d462be3973..54cd18bdcf8685 100644 --- a/integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile +++ b/integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-ameba/Dockerfile b/integrations/docker/images/stage-2/chip-build-ameba/Dockerfile index 7e1d7dca52babc..6683c3acd21f74 100644 --- a/integrations/docker/images/stage-2/chip-build-ameba/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-ameba/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-asr/Dockerfile b/integrations/docker/images/stage-2/chip-build-asr/Dockerfile index d3e54310b58550..c41046512dee89 100644 --- a/integrations/docker/images/stage-2/chip-build-asr/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-asr/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-bouffalolab/Dockerfile b/integrations/docker/images/stage-2/chip-build-bouffalolab/Dockerfile index faf280dd500e26..0e4515903983af 100644 --- a/integrations/docker/images/stage-2/chip-build-bouffalolab/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-bouffalolab/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-cirque/Dockerfile b/integrations/docker/images/stage-2/chip-build-cirque/Dockerfile index 1f10e8eae866d2..c16ac723a4ede1 100644 --- a/integrations/docker/images/stage-2/chip-build-cirque/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-cirque/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=latest +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile b/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile index eb94585076910a..66b682e1435c91 100644 --- a/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile b/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile index a5f01eb0c340eb..1245688807f196 100644 --- a/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-imx/Dockerfile b/integrations/docker/images/stage-2/chip-build-imx/Dockerfile index 9fe24051e0b2d3..a9a5e6c6ac4342 100644 --- a/integrations/docker/images/stage-2/chip-build-imx/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-imx/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-infineon/Dockerfile b/integrations/docker/images/stage-2/chip-build-infineon/Dockerfile index 9b38709d7204a6..5cdcb038584d54 100644 --- a/integrations/docker/images/stage-2/chip-build-infineon/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-infineon/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-java/Dockerfile b/integrations/docker/images/stage-2/chip-build-java/Dockerfile index 16308a3af485f2..70df066b77ca2c 100644 --- a/integrations/docker/images/stage-2/chip-build-java/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-java/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-k32w/Dockerfile b/integrations/docker/images/stage-2/chip-build-k32w/Dockerfile index 5bc74d4410c668..0ee2a372fdd318 100644 --- a/integrations/docker/images/stage-2/chip-build-k32w/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-k32w/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-mbed-os/Dockerfile b/integrations/docker/images/stage-2/chip-build-mbed-os/Dockerfile index 74d782772304cb..62b587f70161aa 100644 --- a/integrations/docker/images/stage-2/chip-build-mbed-os/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-mbed-os/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile index b01028f4708310..50e32047db5a3d 100644 --- a/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 # ================================================== # Temporary image for SDK and dependencies download diff --git a/integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile b/integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile index b1a56350a01d00..5f9ab059b38af2 100644 --- a/integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile index 018344aa4378e6..5668ddafd198bc 100644 --- a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-ti/Dockerfile b/integrations/docker/images/stage-2/chip-build-ti/Dockerfile index 0cc77621bde754..b8a30af367ea65 100644 --- a/integrations/docker/images/stage-2/chip-build-ti/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-ti/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-tizen/Dockerfile b/integrations/docker/images/stage-2/chip-build-tizen/Dockerfile index 5380812b663a8c..08a710157dfae0 100644 --- a/integrations/docker/images/stage-2/chip-build-tizen/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-tizen/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-3/chip-build-android/Dockerfile b/integrations/docker/images/stage-3/chip-build-android/Dockerfile index 9d1f0ef119f543..977188b5fedc38 100644 --- a/integrations/docker/images/stage-3/chip-build-android/Dockerfile +++ b/integrations/docker/images/stage-3/chip-build-android/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build-java:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile b/integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile index 2c044df7312dc8..3bdf85a9520eed 100644 --- a/integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile +++ b/integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build-esp32:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile b/integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile index ff63e5c1940a01..40622da91c107a 100644 --- a/integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile +++ b/integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build-tizen:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile index 8f3a177272b785..f1e64b126e2b48 100644 --- a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=20 FROM ghcr.io/project-chip/chip-build-nrf-platform:${VERSION} AS nrf FROM ghcr.io/project-chip/chip-build-efr32:${VERSION} AS efr32 diff --git a/src/test_driver/tizen/README.md b/src/test_driver/tizen/README.md index eb7ef0cb71683f..c81ab1bf56b353 100644 --- a/src/test_driver/tizen/README.md +++ b/src/test_driver/tizen/README.md @@ -12,7 +12,7 @@ image from hub.docker.com or build it locally using the provided Dockerfile in ```sh # Pull the image from hub.docker.com -docker pull ghcr.io/project-chip/chip-build-tizen-qemu:1 +docker pull ghcr.io/project-chip/chip-build-tizen-qemu:20 ``` ## Building and Running Tests on QEMU @@ -21,7 +21,7 @@ All steps described below should be done inside the docker container. ```sh docker run -it --rm --name chip-tizen-qemu \ - ghcr.io/project-chip/chip-build-tizen-qemu:1 /bin/bash + ghcr.io/project-chip/chip-build-tizen-qemu:20 /bin/bash ``` ### Clone the connectedhomeip repository From 7228e2c5d130434d351f4423623c10f6ae7e5b47 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 16 Oct 2023 11:52:31 -0400 Subject: [PATCH 2/9] Revert java tests since java will only be available in docker image 21 --- .github/workflows/java-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index cb4af69489425d..197ecbcb736326 100644 --- a/.github/workflows/java-tests.yaml +++ b/.github/workflows/java-tests.yaml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-java:20 + image: ghcr.io/project-chip/chip-build-java:1 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0" From ab99166eb052433591407ab7077c4fe8347cc01e Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 16 Oct 2023 12:07:24 -0400 Subject: [PATCH 3/9] Fix type checks according to linter --- scripts/build/builders/android.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/builders/android.py b/scripts/build/builders/android.py index 14802fe5e83e80..a6f2186da6e1e7 100644 --- a/scripts/build/builders/android.py +++ b/scripts/build/builders/android.py @@ -354,7 +354,7 @@ def generate(self): args_str = "" for key, value in gn_args.items(): - if type(value) == bool: + if type(value) is bool: if value: args_str += "%s=true " % (key) else: From 496e2824e09743c09ad57fcaf024589394f4a5c7 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 16 Oct 2023 12:06:02 -0400 Subject: [PATCH 4/9] Fix type checks according to linter --- .../py_matter_idl/matter_idl/matter_idl_parser.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/py_matter_idl/matter_idl/matter_idl_parser.py b/scripts/py_matter_idl/matter_idl/matter_idl_parser.py index e2abbc26e4ce84..21f4002d04ab6b 100755 --- a/scripts/py_matter_idl/matter_idl/matter_idl_parser.py +++ b/scripts/py_matter_idl/matter_idl/matter_idl_parser.py @@ -491,17 +491,17 @@ def cluster(self, meta, api_maturity, side, name, code, *content): code=code, api_maturity=api_maturity) for item in content: - if type(item) == Enum: + if isinstance(item, Enum): result.enums.append(item) - elif type(item) == Bitmap: + elif isinstance(item, Bitmap): result.bitmaps.append(item) - elif type(item) == Event: + elif isinstance(item, Event): result.events.append(item) - elif type(item) == Attribute: + elif isinstance(item, Attribute): result.attributes.append(item) - elif type(item) == Struct: + elif isinstance(item, Struct): result.structs.append(item) - elif type(item) == Command: + elif isinstance(item, Command): result.commands.append(item) else: raise Exception("UNKNOWN cluster content item: %r" % item) From 45de1d53d29cb9b148db4d99cb6d5ac2a8186854 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 16 Oct 2023 12:06:52 -0400 Subject: [PATCH 5/9] Fix type checks according to linter --- scripts/tools/memory/memdf/util/nd.py | 2 +- src/controller/python/chip/tlv/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/tools/memory/memdf/util/nd.py b/scripts/tools/memory/memdf/util/nd.py index 3cfb99e62165eb..7cc8331d79ca12 100644 --- a/scripts/tools/memory/memdf/util/nd.py +++ b/scripts/tools/memory/memdf/util/nd.py @@ -73,7 +73,7 @@ def update(nd: MutableMapping, src: Mapping) -> None: nd[k] += v else: nd[k].append(v) - elif type(nd[k]) == type(v): + elif type(nd[k]) is type(v): nd[k] = v else: raise TypeError(f"type mismatch {k},{v} was {nd[k]}") diff --git a/src/controller/python/chip/tlv/__init__.py b/src/controller/python/chip/tlv/__init__.py index d24569618fb008..2417b78a750678 100644 --- a/src/controller/python/chip/tlv/__init__.py +++ b/src/controller/python/chip/tlv/__init__.py @@ -218,7 +218,7 @@ def put(self, tag, val): self.putBytes(tag, val) elif isinstance(val, Mapping): self.startStructure(tag) - if type(val) == dict: + if type(val) is dict: val = OrderedDict( sorted(val.items(), key=lambda item: tlvTagToSortKey(item[0])) From 5781f564fb29854ca4d88bfbc8466602ade4c2a2 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 16 Oct 2023 12:18:29 -0400 Subject: [PATCH 6/9] Undo some odd awk changes due to script automation --- examples/resource-monitoring-app/telink/README.md | 2 +- examples/shell/telink/README.md | 2 +- examples/smoke-co-alarm-app/telink/README.md | 2 +- examples/temperature-measurement-app/telink/README.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/resource-monitoring-app/telink/README.md b/examples/resource-monitoring-app/telink/README.md index 76ae2430ec49a9..3b6645171511e0 100644 --- a/examples/resource-monitoring-app/telink/README.md +++ b/examples/resource-monitoring-app/telink/README.md @@ -9,7 +9,7 @@ You can use this example as a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/shell/telink/README.md b/examples/shell/telink/README.md index 36c590a46aa10b..2ff00f0046473f 100755 --- a/examples/shell/telink/README.md +++ b/examples/shell/telink/README.md @@ -9,7 +9,7 @@ You can use this example as a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/smoke-co-alarm-app/telink/README.md b/examples/smoke-co-alarm-app/telink/README.md index 4dce6f247c4cfb..f36ecb97d5925e 100755 --- a/examples/smoke-co-alarm-app/telink/README.md +++ b/examples/smoke-co-alarm-app/telink/README.md @@ -9,7 +9,7 @@ You can use this example as a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/temperature-measurement-app/telink/README.md b/examples/temperature-measurement-app/telink/README.md index a045088ec95c2d..fda373eedf2ca9 100644 --- a/examples/temperature-measurement-app/telink/README.md +++ b/examples/temperature-measurement-app/telink/README.md @@ -13,7 +13,7 @@ creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: From a1a43f9e51d01c3f2abb51ac072619082fa21105 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 16 Oct 2023 12:19:13 -0400 Subject: [PATCH 7/9] Undo some odd awk changes due to script automation --- examples/air-quality-sensor-app/telink/README.md | 2 +- examples/all-clusters-app/telink/Readme.md | 2 +- examples/all-clusters-minimal-app/telink/Readme.md | 2 +- examples/bridge-app/telink/README.md | 2 +- examples/contact-sensor-app/telink/README.md | 2 +- examples/light-switch-app/telink/README.md | 2 +- examples/lighting-app/telink/README.md | 2 +- examples/lock-app/telink/README.md | 2 +- examples/ota-requestor-app/telink/Readme.md | 2 +- examples/pump-app/telink/README.md | 2 +- examples/pump-controller-app/telink/README.md | 2 +- examples/thermostat/telink/Readme.md | 2 +- examples/window-app/telink/README.md | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/air-quality-sensor-app/telink/README.md b/examples/air-quality-sensor-app/telink/README.md index 2ff062f1fb9773..eecc7e8bbdbaa6 100644 --- a/examples/air-quality-sensor-app/telink/README.md +++ b/examples/air-quality-sensor-app/telink/README.md @@ -9,7 +9,7 @@ You can use this example as a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/all-clusters-app/telink/Readme.md b/examples/all-clusters-app/telink/Readme.md index 721e736ebc80f4..a8881b7fdeb024 100644 --- a/examples/all-clusters-app/telink/Readme.md +++ b/examples/all-clusters-app/telink/Readme.md @@ -11,7 +11,7 @@ creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/all-clusters-minimal-app/telink/Readme.md b/examples/all-clusters-minimal-app/telink/Readme.md index 06fadb15ff9449..53c750b806baf7 100644 --- a/examples/all-clusters-minimal-app/telink/Readme.md +++ b/examples/all-clusters-minimal-app/telink/Readme.md @@ -11,7 +11,7 @@ for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/bridge-app/telink/README.md b/examples/bridge-app/telink/README.md index 6a7967b90939e8..fd3d70c21e9b84 100644 --- a/examples/bridge-app/telink/README.md +++ b/examples/bridge-app/telink/README.md @@ -88,7 +88,7 @@ defined: 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/contact-sensor-app/telink/README.md b/examples/contact-sensor-app/telink/README.md index 60202e262caff0..cef7f3364dd7dd 100755 --- a/examples/contact-sensor-app/telink/README.md +++ b/examples/contact-sensor-app/telink/README.md @@ -9,7 +9,7 @@ You can use this example as a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/light-switch-app/telink/README.md b/examples/light-switch-app/telink/README.md index 23caebc5d0ab3f..6dc9970c5c732e 100755 --- a/examples/light-switch-app/telink/README.md +++ b/examples/light-switch-app/telink/README.md @@ -14,7 +14,7 @@ creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/lighting-app/telink/README.md b/examples/lighting-app/telink/README.md index 8c1f91a4f0ed7a..666af084b2a8bf 100644 --- a/examples/lighting-app/telink/README.md +++ b/examples/lighting-app/telink/README.md @@ -12,7 +12,7 @@ a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/lock-app/telink/README.md b/examples/lock-app/telink/README.md index 57062044de91c8..2d8e0349d571a1 100755 --- a/examples/lock-app/telink/README.md +++ b/examples/lock-app/telink/README.md @@ -12,7 +12,7 @@ a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/ota-requestor-app/telink/Readme.md b/examples/ota-requestor-app/telink/Readme.md index 0afd0f02956df0..867f498f9df917 100755 --- a/examples/ota-requestor-app/telink/Readme.md +++ b/examples/ota-requestor-app/telink/Readme.md @@ -5,7 +5,7 @@ 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/pump-app/telink/README.md b/examples/pump-app/telink/README.md index 63f23b9b4a6120..a5a656c68adeea 100755 --- a/examples/pump-app/telink/README.md +++ b/examples/pump-app/telink/README.md @@ -13,7 +13,7 @@ reference for creating your own pump application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/pump-controller-app/telink/README.md b/examples/pump-controller-app/telink/README.md index 367ea9a0d76e69..14153386de3b5e 100755 --- a/examples/pump-controller-app/telink/README.md +++ b/examples/pump-controller-app/telink/README.md @@ -14,7 +14,7 @@ your own pump application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/thermostat/telink/Readme.md b/examples/thermostat/telink/Readme.md index 0e509cf4e6fd40..b73e5866b03173 100755 --- a/examples/thermostat/telink/Readme.md +++ b/examples/thermostat/telink/Readme.md @@ -9,7 +9,7 @@ You can use this example as a reference for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: diff --git a/examples/window-app/telink/README.md b/examples/window-app/telink/README.md index e676a85586bbdd..372dbcf8dba809 100644 --- a/examples/window-app/telink/README.md +++ b/examples/window-app/telink/README.md @@ -12,7 +12,7 @@ for creating your own application. 1. Run the Docker container: ```bash - $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F:20 '{print $NF}') + $ docker run -it --rm -v $PWD:/host -w /host ghcr.io/project-chip/chip-build-telink:$(wget -q -O - https://raw.githubusercontent.com/project-chip/connectedhomeip/master/.github/workflows/examples-telink.yaml 2> /dev/null | grep chip-build-telink | awk -F: '{print $NF}') ``` Compatible docker image version can be found in next file: From aab5bf5ac78096e525c6899d20a02677639cd4a4 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 16 Oct 2023 12:20:33 -0400 Subject: [PATCH 8/9] Undo version setting in dockerfile as that seems wrong --- examples/bridge-app/linux/Dockerfile | 2 +- examples/chip-tool/Dockerfile | 2 +- examples/lighting-app/linux/Dockerfile | 2 +- examples/resource-monitoring-app/linux/Dockerfile | 2 +- .../docker/images/stage-1/chip-build-crosscompile/Dockerfile | 2 +- integrations/docker/images/stage-2/chip-build-ameba/Dockerfile | 2 +- integrations/docker/images/stage-2/chip-build-asr/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-bouffalolab/Dockerfile | 2 +- integrations/docker/images/stage-2/chip-build-cirque/Dockerfile | 2 +- integrations/docker/images/stage-2/chip-build-efr32/Dockerfile | 2 +- integrations/docker/images/stage-2/chip-build-esp32/Dockerfile | 2 +- integrations/docker/images/stage-2/chip-build-imx/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-infineon/Dockerfile | 2 +- integrations/docker/images/stage-2/chip-build-java/Dockerfile | 2 +- integrations/docker/images/stage-2/chip-build-k32w/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-mbed-os/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-nrf-platform/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-openiotsdk/Dockerfile | 2 +- integrations/docker/images/stage-2/chip-build-telink/Dockerfile | 2 +- integrations/docker/images/stage-2/chip-build-ti/Dockerfile | 2 +- integrations/docker/images/stage-2/chip-build-tizen/Dockerfile | 2 +- .../docker/images/stage-3/chip-build-android/Dockerfile | 2 +- .../docker/images/stage-3/chip-build-esp32-qemu/Dockerfile | 2 +- .../docker/images/stage-3/chip-build-tizen-qemu/Dockerfile | 2 +- integrations/docker/images/vscode/chip-build-vscode/Dockerfile | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/bridge-app/linux/Dockerfile b/examples/bridge-app/linux/Dockerfile index faa41967425f5d..f971e778349958 100644 --- a/examples/bridge-app/linux/Dockerfile +++ b/examples/bridge-app/linux/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-cirque-device-base:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/examples/chip-tool/Dockerfile b/examples/chip-tool/Dockerfile index ec0b6c5f22421d..ee6c0ff62a9794 100644 --- a/examples/chip-tool/Dockerfile +++ b/examples/chip-tool/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-cirque-device-base:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/examples/lighting-app/linux/Dockerfile b/examples/lighting-app/linux/Dockerfile index 7c8df8f64b5e25..73be41d186c211 100644 --- a/examples/lighting-app/linux/Dockerfile +++ b/examples/lighting-app/linux/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-cirque-device-base:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/examples/resource-monitoring-app/linux/Dockerfile b/examples/resource-monitoring-app/linux/Dockerfile index 8d1e2072082d14..78f41ab73a9897 100644 --- a/examples/resource-monitoring-app/linux/Dockerfile +++ b/examples/resource-monitoring-app/linux/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -ARG VERSION=20 +ARG VERSION=1 FROM connectedhomeip/chip-cirque-device-base:${VERSION} COPY out/debug/chip-resource-monitoring-app /usr/bin/ diff --git a/integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile b/integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile index 54cd18bdcf8685..8767d462be3973 100644 --- a/integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile +++ b/integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-ameba/Dockerfile b/integrations/docker/images/stage-2/chip-build-ameba/Dockerfile index 6683c3acd21f74..7e1d7dca52babc 100644 --- a/integrations/docker/images/stage-2/chip-build-ameba/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-ameba/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-asr/Dockerfile b/integrations/docker/images/stage-2/chip-build-asr/Dockerfile index c41046512dee89..d3e54310b58550 100644 --- a/integrations/docker/images/stage-2/chip-build-asr/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-asr/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-bouffalolab/Dockerfile b/integrations/docker/images/stage-2/chip-build-bouffalolab/Dockerfile index 0e4515903983af..faf280dd500e26 100644 --- a/integrations/docker/images/stage-2/chip-build-bouffalolab/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-bouffalolab/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-cirque/Dockerfile b/integrations/docker/images/stage-2/chip-build-cirque/Dockerfile index c16ac723a4ede1..1f10e8eae866d2 100644 --- a/integrations/docker/images/stage-2/chip-build-cirque/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-cirque/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=latest FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile b/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile index 66b682e1435c91..eb94585076910a 100644 --- a/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile b/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile index 1245688807f196..a5f01eb0c340eb 100644 --- a/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-imx/Dockerfile b/integrations/docker/images/stage-2/chip-build-imx/Dockerfile index a9a5e6c6ac4342..9fe24051e0b2d3 100644 --- a/integrations/docker/images/stage-2/chip-build-imx/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-imx/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-infineon/Dockerfile b/integrations/docker/images/stage-2/chip-build-infineon/Dockerfile index 5cdcb038584d54..9b38709d7204a6 100644 --- a/integrations/docker/images/stage-2/chip-build-infineon/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-infineon/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-java/Dockerfile b/integrations/docker/images/stage-2/chip-build-java/Dockerfile index 70df066b77ca2c..16308a3af485f2 100644 --- a/integrations/docker/images/stage-2/chip-build-java/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-java/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-k32w/Dockerfile b/integrations/docker/images/stage-2/chip-build-k32w/Dockerfile index 0ee2a372fdd318..5bc74d4410c668 100644 --- a/integrations/docker/images/stage-2/chip-build-k32w/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-k32w/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-mbed-os/Dockerfile b/integrations/docker/images/stage-2/chip-build-mbed-os/Dockerfile index 62b587f70161aa..74d782772304cb 100644 --- a/integrations/docker/images/stage-2/chip-build-mbed-os/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-mbed-os/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile index 50e32047db5a3d..b01028f4708310 100644 --- a/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 # ================================================== # Temporary image for SDK and dependencies download diff --git a/integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile b/integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile index 5f9ab059b38af2..b1a56350a01d00 100644 --- a/integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile index 5668ddafd198bc..018344aa4378e6 100644 --- a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-ti/Dockerfile b/integrations/docker/images/stage-2/chip-build-ti/Dockerfile index b8a30af367ea65..0cc77621bde754 100644 --- a/integrations/docker/images/stage-2/chip-build-ti/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-ti/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-2/chip-build-tizen/Dockerfile b/integrations/docker/images/stage-2/chip-build-tizen/Dockerfile index 08a710157dfae0..5380812b663a8c 100644 --- a/integrations/docker/images/stage-2/chip-build-tizen/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-tizen/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-3/chip-build-android/Dockerfile b/integrations/docker/images/stage-3/chip-build-android/Dockerfile index 977188b5fedc38..9d1f0ef119f543 100644 --- a/integrations/docker/images/stage-3/chip-build-android/Dockerfile +++ b/integrations/docker/images/stage-3/chip-build-android/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build-java:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile b/integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile index 3bdf85a9520eed..2c044df7312dc8 100644 --- a/integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile +++ b/integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build-esp32:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile b/integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile index 40622da91c107a..ff63e5c1940a01 100644 --- a/integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile +++ b/integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build-tizen:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile index f1e64b126e2b48..8f3a177272b785 100644 --- a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=20 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build-nrf-platform:${VERSION} AS nrf FROM ghcr.io/project-chip/chip-build-efr32:${VERSION} AS efr32 From 69e3dd27a464f8b162f16bb2398bee0c76465056 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 16 Oct 2023 13:08:48 -0400 Subject: [PATCH 9/9] One more isinstance change to make linter happy --- scripts/py_matter_idl/matter_idl/matter_idl_parser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/py_matter_idl/matter_idl/matter_idl_parser.py b/scripts/py_matter_idl/matter_idl/matter_idl_parser.py index 21f4002d04ab6b..0d1bfb8d869e49 100755 --- a/scripts/py_matter_idl/matter_idl/matter_idl_parser.py +++ b/scripts/py_matter_idl/matter_idl/matter_idl_parser.py @@ -513,9 +513,9 @@ def idl(self, items): endpoints = [] for item in items: - if type(item) == Cluster: + if isinstance(item, Cluster): clusters.append(item) - elif type(item) == Endpoint: + elif isinstance(item, Endpoint): endpoints.append(item) else: raise Exception("UNKNOWN idl content item: %r" % item)