diff --git a/examples/all-clusters-app/linux/Dockerfile b/examples/all-clusters-app/linux/Dockerfile index 3264910bfc9c6a..6a46b2ddcb751a 100644 --- 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 index 4ee91d7f2f7d98..f971e778349958 100644 --- 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 index ef1dec634e3905..ee6c0ff62a9794 100644 --- 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 index b84e9913800075..73be41d186c211 100644 --- 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 index 12edb66a4cabc2..78f41ab73a9897 100644 --- 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 index b3792bc5fe92e0..ffbfce8a1867d3 100755 --- 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 index ec8abe02158648..02f78a25560065 100755 --- 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 index 64636dd42c5d64..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=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 index db3ae1ca842ebe..07f8118b5f004d 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=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 index c00b97a6763b95..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=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 index 3a90bd9b00be43..39956620d5b41b 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=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 index 6769daef681402..511bfba3022db6 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=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 index 7f7b8a9c7da83b..71ce49fe5e84ba 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=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 index 35ab85f986cda1..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=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 index 9b2ef70394bf52..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=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 index e0958294e5ed8e..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=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 index bef2b594d6b519..42e1dde62a56d9 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=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 index ea574b0094b216..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=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 index 518e722e72d62d..2d0e0aa9a80fb7 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=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 index 47e35df21c32df..b61d8860b3b18a 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=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 index 567d735b52eb6c..88ac1d10828ccc 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=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 index 22be64824788e9..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=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 index ce276d2c73d610..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=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 index 62c759aa5fab92..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=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 index 527f361956223b..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=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 index 625649d46fa9c1..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=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 index 35135ae238f87e..bf90c8ae7dfedf 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=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 index 545118d4842a56..a137af03545dd6 100755 --- 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 index ef05eb60565ce3..551fb8d0f659a5 160000 --- a/third_party/silabs/gecko_sdk +++ b/third_party/silabs/gecko_sdk @@ -1 +1 @@ -Subproject commit ef05eb60565ce3be035b79b8fac1f9d12c7e706b +Subproject commit 551fb8d0f659a56dcb0abde93cef7b8464bf0ac6