Use latest docker version everywhere (#29794)

* Use latest docker version everywhere * Revert java tests since java will only be available in docker image 21 * Fix type checks according to linter * Fix type checks according to linter * Fix type checks according to linter * Undo some odd awk changes due to script automation * Undo some odd awk changes due to script automation * Undo version setting in dockerfile as that seems wrong * One more isinstance change to make linter happy
project-chip · Jan 29, 2024 · 1486020 · 1486020
1 parent e99ebdc
commit 1486020
Show file tree

Hide file tree

Showing 47 changed files with 73 additions and 73 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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