Pinning all versions, fixing script (#28140)

woody-apple · restyled-commits · pull[bot] · commit 12951580874b · 2023-07-21T19:52:02.000Z
* Pinning version, fixing script

* Restyled by shfmt

---------

Co-authored-by: Restyled.io &lt;commits@restyled.io&gt;
diff --git a/examples/all-clusters-app/linux/Dockerfile b/examples/all-clusters-app/linux/Dockerfile
@@ -15,7 +15,7 @@
 #   limitations under the License.
 #
 
-from generic_node_image
+FROM generic_node_image
 RUN apt-get install -y libglib2.0
 COPY out/debug/chip-all-clusters-app /usr/bin/
 COPY entrypoint.sh /
diff --git a/examples/bridge-app/linux/Dockerfile b/examples/bridge-app/linux/Dockerfile
@@ -15,7 +15,8 @@
 #   limitations under the License.
 #
 
-FROM ghcr.io/project-chip/chip-cirque-device-base:latest
+ARG VERSION=1
+FROM ghcr.io/project-chip/chip-cirque-device-base:${VERSION}
 LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 
 COPY out/debug/chip-bridge-app /usr/bin/
diff --git a/examples/chip-tool/Dockerfile b/examples/chip-tool/Dockerfile
@@ -15,7 +15,8 @@
 #   limitations under the License.
 #
 
-FROM ghcr.io/project-chip/chip-cirque-device-base:latest
+ARG VERSION=1
+FROM ghcr.io/project-chip/chip-cirque-device-base:${VERSION}
 LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 
 COPY out/debug/chip-tool /usr/bin/
diff --git a/examples/lighting-app/linux/Dockerfile b/examples/lighting-app/linux/Dockerfile
@@ -15,7 +15,8 @@
 #   limitations under the License.
 #
 
-FROM ghcr.io/project-chip/chip-cirque-device-base:latest
+ARG VERSION=1
+FROM ghcr.io/project-chip/chip-cirque-device-base:${VERSION}
 LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 
 COPY out/debug/chip-lighting-app /usr/bin/
diff --git a/examples/resource-monitoring-app/linux/Dockerfile b/examples/resource-monitoring-app/linux/Dockerfile
@@ -15,7 +15,8 @@
 #   limitations under the License.
 #
 
-FROM connectedhomeip/chip-cirque-device-base:latest
+ARG VERSION=1
+FROM connectedhomeip/chip-cirque-device-base:${VERSION}
 
 COPY out/debug/chip-resource-monitoring-app /usr/bin/
 COPY entrypoint.sh /
diff --git a/examples/shell/telink/README.md b/examples/shell/telink/README.md
@@ -9,13 +9,13 @@ You can use this example as a reference for creating your own application.
 1. Pull docker image from repository:
 
     ```bash
-    $ docker pull connectedhomeip/chip-build-telink:latest
+    $ docker pull ghcr.io/project-chip/chip-build-telink:1
     ```
 
 1. Run docker container:
 
     ```bash
-    $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" connectedhomeip/chip-build-telink:latest
+    $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1
     ```
 
     here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay
diff --git a/examples/smoke-co-alarm-app/telink/README.md b/examples/smoke-co-alarm-app/telink/README.md
@@ -9,13 +9,13 @@ You can use this example as a reference for creating your own application.
 1. Pull docker image from repository:
 
     ```bash
-    $ docker pull connectedhomeip/chip-build-telink:latest
+    $ docker pull ghcr.io/project-chip/chip-build-telink:1
     ```
 
 1. Run docker container:
 
     ```bash
-    $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" connectedhomeip/chip-build-telink:latest
+    $ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1
     ```
 
     here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay
diff --git 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=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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-efr32/Dockerfile b/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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-esp32/Dockerfile b/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
@@ -1,4 +1,4 @@
-ARG VERSION=latest
+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
diff --git a/scripts/helpers/roll_docker_version.sh b/scripts/helpers/roll_docker_version.sh
@@ -56,7 +56,7 @@ echo "Rolling VSCode container"
 sed -r -i "s|matter-dev-environment:local --version [0-9,a-z,A-Z,-]*|matter-dev-environment:local --version $NEXT_VERSION|" .devcontainer/devcontainer.json
 
 echo "Rolling docker images"
-find . -iname readme.md -not -path "./third_party/*" | xargs sed -r -i "s|ARG VERSION=[0-9,a-z,A-Z,-]*|ARG VERSION=$NEXT_VERSION|"
+find . -iname Dockerfile -not -path "./third_party/*" | xargs sed -r -i "s|ARG VERSION=[0-9,a-z,A-Z,-]*|ARG VERSION=$NEXT_VERSION|"
 
 echo "Rolling main docker version"
 echo "$NEXT_VERSION : $ROLL_REASON" >./integrations/docker/images/base/chip-build/version
diff --git a/third_party/silabs/gecko_sdk b/third_party/silabs/gecko_sdk
@@ -1 +1 @@
-Subproject commit ef05eb60565ce3be035b79b8fac1f9d12c7e706b
+Subproject commit 551fb8d0f659a56dcb0abde93cef7b8464bf0ac6

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`# limitations under the License.`
`16`	`16`	`#`
`17`	`17`
`18`		`-from generic_node_image`
	`18`	`+FROM generic_node_image`
`19`	`19`	`RUN apt-get install -y libglib2.0`
`20`	`20`	`COPY out/debug/chip-all-clusters-app /usr/bin/`
`21`	`21`	`COPY entrypoint.sh /`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@`
`15`	`15`	`# limitations under the License.`
`16`	`16`	`#`
`17`	`17`
`18`		`-FROM ghcr.io/project-chip/chip-cirque-device-base:latest`
	`18`	`+ARG VERSION=1`
	`19`	`+FROM ghcr.io/project-chip/chip-cirque-device-base:${VERSION}`
`19`	`20`	`LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip`
`20`	`21`
`21`	`22`	`COPY out/debug/chip-bridge-app /usr/bin/`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG VERSION=latest`
	`1`	`+ARG VERSION=1`
`2`	`2`	`FROM ghcr.io/project-chip/chip-build:${VERSION} as build`
`3`	`3`	`LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip`
`4`	`4`