From f0adeefd5bb772271afbd9ceaad94badfc824630 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Fri, 14 Jul 2023 11:51:49 -0700 Subject: [PATCH] Moving us to github container registry (#27879) Co-authored-by: Restyled.io --- .devcontainer/Dockerfile | 3 +- .devcontainer/devcontainer.json | 2 +- .github/.wordlist.txt | 1 + .github/workflows/bloat_check.yaml | 2 +- .github/workflows/build.yaml | 8 +- .github/workflows/chef.yaml | 6 +- .github/workflows/cirque.yaml | 127 ---------- .github/workflows/docker_img.yaml | 136 ++++++++-- .github/workflows/doxygen.yaml | 2 +- .github/workflows/examples-ameba.yaml | 2 +- .github/workflows/examples-asr.yaml | 2 +- .github/workflows/examples-bouffalolab.yaml | 2 +- .../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 +- .../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-telink.yaml | 2 +- .github/workflows/examples-tizen.yaml | 2 +- .github/workflows/full-android.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/roll_and_build_docker.yaml | 15 ++ .github/workflows/smoketest-android.yaml | 2 +- .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/all-clusters-app/ameba/README.md | 4 +- examples/all-clusters-app/telink/Readme.md | 4 +- .../all-clusters-minimal-app/ameba/README.md | 4 +- .../all-clusters-minimal-app/telink/Readme.md | 4 +- examples/bridge-app/linux/Dockerfile | 3 +- examples/bridge-app/telink/README.md | 4 +- examples/chef/README.md | 6 +- examples/chip-tool/Dockerfile | 3 +- examples/contact-sensor-app/telink/README.md | 4 +- examples/light-switch-app/ameba/README.md | 4 +- examples/light-switch-app/telink/README.md | 4 +- examples/lighting-app/ameba/README.md | 4 +- examples/lighting-app/linux/Dockerfile | 3 +- examples/lighting-app/telink/README.md | 4 +- examples/lock-app/telink/README.md | 4 +- examples/ota-requestor-app/ameba/README.md | 4 +- examples/ota-requestor-app/telink/Readme.md | 4 +- examples/pigweed-app/ameba/README.md | 4 +- examples/pump-app/telink/README.md | 4 +- examples/pump-controller-app/telink/README.md | 4 +- .../telink/README.md | 4 +- examples/thermostat/telink/Readme.md | 4 +- examples/window-app/telink/README.md | 4 +- integrations/README.md | 3 - integrations/cloudbuild/chef.yaml | 18 +- integrations/docker/{images => }/build-all.sh | 37 ++- integrations/docker/build.sh | 25 +- .../CHIPCirqueDaemon.py | 138 ---------- .../chip-cirque-device-base/Dockerfile | 63 ----- .../chip-cirque-device-base/build.sh | 111 --------- .../chip-cirque-device-base/cachekey.sh | 40 --- .../chip-cirque-device-base/entrypoint.sh | 21 -- .../chip-cirque-device-base/version | 1 - .../{ => base}/chip-build-minimal/Dockerfile | 1 + .../images/base/chip-build-minimal/build.sh | 1 + .../images/base/chip-build-minimal/run.sh | 1 + .../chip-build-minimal}/version | 0 .../images/{ => base}/chip-build/Dockerfile | 1 + .../images/{ => base}/chip-build/README.md | 2 +- .../docker/images/base/chip-build/build.sh | 1 + .../docker/images/base/chip-build/run.sh | 1 + .../docker/images/base/chip-build/version | 1 + .../docker/images/chip-build-ameba/build.sh | 1 - .../docker/images/chip-build-ameba/run.sh | 1 - .../docker/images/chip-build-android/build.sh | 1 - .../docker/images/chip-build-android/run.sh | 1 - .../docker/images/chip-build-android/version | 1 - .../docker/images/chip-build-asr/build.sh | 1 - .../docker/images/chip-build-asr/run.sh | 1 - .../docker/images/chip-build-asr/version | 1 - .../images/chip-build-bouffalolab/Dockerfile | 17 -- .../images/chip-build-bouffalolab/build.sh | 1 - .../images/chip-build-bouffalolab/run.sh | 1 - .../images/chip-build-bouffalolab/version | 1 - .../images/chip-build-cirque/Dockerfile | 45 ---- .../docker/images/chip-build-cirque/README.md | 36 --- .../docker/images/chip-build-cirque/build.sh | 1 - .../chip-build-cirque/requirements_nogrpc.txt | 8 - .../docker/images/chip-build-cirque/run.sh | 1 - .../docker/images/chip-build-cirque/version | 1 - .../images/chip-build-crosscompile/build.sh | 1 - .../images/chip-build-crosscompile/run.sh | 1 - .../images/chip-build-crosscompile/version | 1 - .../docker/images/chip-build-doxygen/build.sh | 1 - .../docker/images/chip-build-doxygen/run.sh | 1 - .../docker/images/chip-build-doxygen/version | 1 - .../docker/images/chip-build-efr32/build.sh | 1 - .../docker/images/chip-build-efr32/run.sh | 1 - .../docker/images/chip-build-efr32/version | 1 - .../images/chip-build-esp32-qemu/build.sh | 1 - .../images/chip-build-esp32-qemu/run.sh | 1 - .../images/chip-build-esp32-qemu/version | 1 - .../docker/images/chip-build-esp32/build.sh | 1 - .../docker/images/chip-build-esp32/run.sh | 1 - .../docker/images/chip-build-esp32/version | 1 - .../docker/images/chip-build-imx/build.sh | 1 - .../docker/images/chip-build-imx/run.sh | 1 - .../docker/images/chip-build-imx/version | 1 - .../images/chip-build-infineon/build.sh | 1 - .../docker/images/chip-build-infineon/run.sh | 1 - .../docker/images/chip-build-infineon/version | 1 - .../docker/images/chip-build-java/build.sh | 1 - .../docker/images/chip-build-java/run.sh | 1 - .../docker/images/chip-build-java/version | 1 - .../docker/images/chip-build-k32w/build.sh | 1 - .../docker/images/chip-build-k32w/run.sh | 1 - .../docker/images/chip-build-k32w/version | 1 - .../docker/images/chip-build-mbed-os/build.sh | 1 - .../docker/images/chip-build-mbed-os/run.sh | 1 - .../docker/images/chip-build-mbed-os/version | 1 - .../docker/images/chip-build-minimal/build.sh | 1 - .../docker/images/chip-build-minimal/run.sh | 1 - .../docker/images/chip-build-minimal/version | 1 - .../images/chip-build-nrf-platform/build.sh | 1 - .../images/chip-build-nrf-platform/run.sh | 1 - .../images/chip-build-nrf-platform/version | 1 - .../images/chip-build-openiotsdk/build.sh | 1 - .../images/chip-build-openiotsdk/run.sh | 1 - .../images/chip-build-openiotsdk/version | 1 - .../docker/images/chip-build-telink/build.sh | 1 - .../docker/images/chip-build-telink/run.sh | 1 - .../docker/images/chip-build-telink/version | 1 - .../docker/images/chip-build-ti/build.sh | 1 - .../docker/images/chip-build-ti/run.sh | 1 - .../docker/images/chip-build-ti/version | 1 - .../images/chip-build-tizen-qemu/build.sh | 1 - .../images/chip-build-tizen-qemu/run.sh | 1 - .../images/chip-build-tizen-qemu/version | 1 - .../docker/images/chip-build-tizen/build.sh | 1 - .../docker/images/chip-build-tizen/run.sh | 1 - .../docker/images/chip-build-tizen/version | 1 - .../docker/images/chip-build-vscode/build.sh | 1 - .../docker/images/chip-build-vscode/run.sh | 1 - .../docker/images/chip-build-vscode/version | 1 - .../docker/images/chip-build/build.sh | 1 - integrations/docker/images/chip-build/run.sh | 1 - integrations/docker/images/chip-build/version | 1 - .../docker/images/chip-cert-bins/Dockerfile | 235 +++++++++--------- .../chip-build-crosscompile/.gitignore | 0 .../chip-build-crosscompile/Dockerfile | 6 +- .../chip-build-crosscompile/README.md | 0 .../stage-1/chip-build-crosscompile/build.sh | 1 + .../stage-1/chip-build-crosscompile/run.sh | 1 + .../stage-1/chip-build-crosscompile/version | 1 + .../{ => stage-2}/chip-build-ameba/Dockerfile | 3 +- .../images/stage-2/chip-build-ameba/build.sh | 1 + .../images/stage-2/chip-build-ameba/run.sh | 1 + .../images/stage-2/chip-build-ameba/version | 1 + .../{ => stage-2}/chip-build-asr/Dockerfile | 3 +- .../images/stage-2/chip-build-asr/build.sh | 1 + .../images/stage-2/chip-build-asr/run.sh | 1 + .../images/stage-2/chip-build-asr/version | 1 + .../stage-2/chip-build-bouffalolab/Dockerfile | 18 ++ .../stage-2/chip-build-bouffalolab/build.sh | 1 + .../stage-2/chip-build-bouffalolab/run.sh | 1 + .../chip-build-bouffalolab/setup.sh | 0 .../stage-2/chip-build-bouffalolab/version | 1 + .../chip-build-doxygen/Dockerfile | 1 + .../stage-2/chip-build-doxygen/build.sh | 1 + .../images/stage-2/chip-build-doxygen/run.sh | 1 + .../images/stage-2/chip-build-doxygen/version | 1 + .../{ => stage-2}/chip-build-efr32/Dockerfile | 8 +- .../images/stage-2/chip-build-efr32/build.sh | 1 + .../images/stage-2/chip-build-efr32/run.sh | 1 + .../images/stage-2/chip-build-efr32/version | 1 + .../{ => stage-2}/chip-build-esp32/Dockerfile | 5 +- .../images/stage-2/chip-build-esp32/build.sh | 1 + .../images/stage-2/chip-build-esp32/run.sh | 1 + .../images/stage-2/chip-build-esp32/version | 1 + .../{ => stage-2}/chip-build-imx/Dockerfile | 6 +- .../images/stage-2/chip-build-imx/build.sh | 1 + .../images/stage-2/chip-build-imx/run.sh | 1 + .../images/stage-2/chip-build-imx/version | 1 + .../chip-build-infineon/Dockerfile | 11 +- .../stage-2/chip-build-infineon/build.sh | 1 + .../images/stage-2/chip-build-infineon/run.sh | 1 + .../stage-2/chip-build-infineon/version | 1 + .../{ => stage-2}/chip-build-java/Dockerfile | 3 +- .../images/stage-2/chip-build-java/build.sh | 1 + .../images/stage-2/chip-build-java/run.sh | 1 + .../images/stage-2/chip-build-java/version | 1 + .../{ => stage-2}/chip-build-k32w/Dockerfile | 5 +- .../images/stage-2/chip-build-k32w/build.sh | 1 + .../images/stage-2/chip-build-k32w/run.sh | 1 + .../images/stage-2/chip-build-k32w/version | 1 + .../chip-build-mbed-os/Dockerfile | 17 +- .../stage-2/chip-build-mbed-os/build.sh | 1 + .../images/stage-2/chip-build-mbed-os/run.sh | 1 + .../images/stage-2/chip-build-mbed-os/version | 1 + .../chip-build-nrf-platform/Dockerfile | 5 +- .../stage-2/chip-build-nrf-platform/build.sh | 1 + .../stage-2/chip-build-nrf-platform/run.sh | 1 + .../stage-2/chip-build-nrf-platform/version | 1 + .../chip-build-openiotsdk/Dockerfile | 6 +- .../stage-2/chip-build-openiotsdk/build.sh | 1 + .../stage-2/chip-build-openiotsdk/run.sh | 1 + .../stage-2/chip-build-openiotsdk/version | 1 + .../chip-build-telink/Dockerfile | 6 +- .../images/stage-2/chip-build-telink/build.sh | 1 + .../images/stage-2/chip-build-telink/run.sh | 1 + .../images/stage-2/chip-build-telink/version | 1 + .../{ => stage-2}/chip-build-ti/Dockerfile | 3 +- .../images/stage-2/chip-build-ti/build.sh | 1 + .../images/stage-2/chip-build-ti/run.sh | 1 + .../images/stage-2/chip-build-ti/version | 1 + .../{ => stage-2}/chip-build-tizen/Dockerfile | 3 +- .../images/stage-2/chip-build-tizen/build.sh | 1 + .../images/stage-2/chip-build-tizen/run.sh | 1 + .../tizen-sdk-installer/install.sh | 0 .../tizen-sdk-installer/secret-tool.py | 0 .../images/stage-2/chip-build-tizen/version | 1 + .../chip-build-android/Dockerfile | 3 +- .../stage-3/chip-build-android/build.sh | 1 + .../images/stage-3/chip-build-android/run.sh | 1 + .../images/stage-3/chip-build-android/version | 1 + .../chip-build-esp32-qemu/Dockerfile | 3 +- .../stage-3/chip-build-esp32-qemu/build.sh | 1 + .../stage-3/chip-build-esp32-qemu/run.sh | 1 + .../stage-3/chip-build-esp32-qemu/version | 1 + .../chip-build-tizen-qemu/Dockerfile | 3 +- .../stage-3/chip-build-tizen-qemu/build.sh | 1 + .../0001-smack-add-permissive-mode.patch | 0 .../stage-3/chip-build-tizen-qemu/run.sh | 1 + .../stage-3/chip-build-tizen-qemu/version | 1 + .../{ => vscode}/chip-build-vscode/Dockerfile | 40 +-- .../images/vscode/chip-build-vscode/build.sh | 1 + .../images/vscode/chip-build-vscode/run.sh | 1 + .../images/vscode/chip-build-vscode/version | 1 + integrations/docker/run.sh | 6 +- scripts/helpers/roll_docker_version.sh | 22 ++ scripts/tests/cirque_tests.sh | 9 +- .../CommissioningFailureOnReportTest.py | 4 +- .../linux-cirque/CommissioningFailureTest.py | 4 +- .../linux-cirque/CommissioningTest.py | 6 +- .../linux-cirque/CommissioningWindowTest.py | 4 +- .../linux-cirque/EchoOverTcpTest.py | 4 +- src/test_driver/linux-cirque/EchoTest.py | 4 +- src/test_driver/linux-cirque/FailsafeTest.py | 4 +- .../linux-cirque/InteractionModelTest.py | 4 +- .../linux-cirque/MobileDeviceTest.py | 4 +- .../linux-cirque/OnOffClusterTest.py | 4 +- .../linux-cirque/PythonCommissioningTest.py | 6 +- src/test_driver/linux-cirque/README.md | 6 +- .../linux-cirque/SplitCommissioningTest.py | 6 +- .../topologies/one_node_one_android.json | 2 +- .../topologies/three_node_with_ipv6.json | 6 +- .../topologies/three_node_with_ipvlan.json | 6 +- .../topologies/three_node_with_thread.json | 6 +- .../topologies/two_node_with_thread.json | 4 +- src/test_driver/tizen/README.md | 4 +- 271 files changed, 662 insertions(+), 1025 deletions(-) delete mode 100644 .github/workflows/cirque.yaml create mode 100644 .github/workflows/roll_and_build_docker.yaml rename integrations/docker/{images => }/build-all.sh (50%) delete mode 100755 integrations/docker/ci-only-images/chip-cirque-device-base/CHIPCirqueDaemon.py delete mode 100644 integrations/docker/ci-only-images/chip-cirque-device-base/Dockerfile delete mode 100755 integrations/docker/ci-only-images/chip-cirque-device-base/build.sh delete mode 100755 integrations/docker/ci-only-images/chip-cirque-device-base/cachekey.sh delete mode 100755 integrations/docker/ci-only-images/chip-cirque-device-base/entrypoint.sh delete mode 100644 integrations/docker/ci-only-images/chip-cirque-device-base/version rename integrations/docker/images/{ => base}/chip-build-minimal/Dockerfile (92%) create mode 120000 integrations/docker/images/base/chip-build-minimal/build.sh create mode 120000 integrations/docker/images/base/chip-build-minimal/run.sh rename integrations/docker/images/{chip-build-ameba => base/chip-build-minimal}/version (100%) rename integrations/docker/images/{ => base}/chip-build/Dockerfile (98%) rename integrations/docker/images/{ => base}/chip-build/README.md (93%) create mode 120000 integrations/docker/images/base/chip-build/build.sh create mode 120000 integrations/docker/images/base/chip-build/run.sh create mode 100644 integrations/docker/images/base/chip-build/version delete mode 120000 integrations/docker/images/chip-build-ameba/build.sh delete mode 120000 integrations/docker/images/chip-build-ameba/run.sh delete mode 120000 integrations/docker/images/chip-build-android/build.sh delete mode 120000 integrations/docker/images/chip-build-android/run.sh delete mode 120000 integrations/docker/images/chip-build-android/version delete mode 120000 integrations/docker/images/chip-build-asr/build.sh delete mode 120000 integrations/docker/images/chip-build-asr/run.sh delete mode 120000 integrations/docker/images/chip-build-asr/version delete mode 100644 integrations/docker/images/chip-build-bouffalolab/Dockerfile delete mode 120000 integrations/docker/images/chip-build-bouffalolab/build.sh delete mode 120000 integrations/docker/images/chip-build-bouffalolab/run.sh delete mode 120000 integrations/docker/images/chip-build-bouffalolab/version delete mode 100644 integrations/docker/images/chip-build-cirque/Dockerfile delete mode 100644 integrations/docker/images/chip-build-cirque/README.md delete mode 120000 integrations/docker/images/chip-build-cirque/build.sh delete mode 100644 integrations/docker/images/chip-build-cirque/requirements_nogrpc.txt delete mode 120000 integrations/docker/images/chip-build-cirque/run.sh delete mode 120000 integrations/docker/images/chip-build-cirque/version delete mode 120000 integrations/docker/images/chip-build-crosscompile/build.sh delete mode 120000 integrations/docker/images/chip-build-crosscompile/run.sh delete mode 120000 integrations/docker/images/chip-build-crosscompile/version delete mode 120000 integrations/docker/images/chip-build-doxygen/build.sh delete mode 120000 integrations/docker/images/chip-build-doxygen/run.sh delete mode 120000 integrations/docker/images/chip-build-doxygen/version delete mode 120000 integrations/docker/images/chip-build-efr32/build.sh delete mode 120000 integrations/docker/images/chip-build-efr32/run.sh delete mode 120000 integrations/docker/images/chip-build-efr32/version delete mode 120000 integrations/docker/images/chip-build-esp32-qemu/build.sh delete mode 120000 integrations/docker/images/chip-build-esp32-qemu/run.sh delete mode 120000 integrations/docker/images/chip-build-esp32-qemu/version delete mode 120000 integrations/docker/images/chip-build-esp32/build.sh delete mode 120000 integrations/docker/images/chip-build-esp32/run.sh delete mode 120000 integrations/docker/images/chip-build-esp32/version delete mode 120000 integrations/docker/images/chip-build-imx/build.sh delete mode 120000 integrations/docker/images/chip-build-imx/run.sh delete mode 120000 integrations/docker/images/chip-build-imx/version delete mode 120000 integrations/docker/images/chip-build-infineon/build.sh delete mode 120000 integrations/docker/images/chip-build-infineon/run.sh delete mode 120000 integrations/docker/images/chip-build-infineon/version delete mode 120000 integrations/docker/images/chip-build-java/build.sh delete mode 120000 integrations/docker/images/chip-build-java/run.sh delete mode 120000 integrations/docker/images/chip-build-java/version delete mode 120000 integrations/docker/images/chip-build-k32w/build.sh delete mode 120000 integrations/docker/images/chip-build-k32w/run.sh delete mode 120000 integrations/docker/images/chip-build-k32w/version delete mode 120000 integrations/docker/images/chip-build-mbed-os/build.sh delete mode 120000 integrations/docker/images/chip-build-mbed-os/run.sh delete mode 120000 integrations/docker/images/chip-build-mbed-os/version delete mode 120000 integrations/docker/images/chip-build-minimal/build.sh delete mode 120000 integrations/docker/images/chip-build-minimal/run.sh delete mode 120000 integrations/docker/images/chip-build-minimal/version delete mode 120000 integrations/docker/images/chip-build-nrf-platform/build.sh delete mode 120000 integrations/docker/images/chip-build-nrf-platform/run.sh delete mode 120000 integrations/docker/images/chip-build-nrf-platform/version delete mode 120000 integrations/docker/images/chip-build-openiotsdk/build.sh delete mode 120000 integrations/docker/images/chip-build-openiotsdk/run.sh delete mode 120000 integrations/docker/images/chip-build-openiotsdk/version delete mode 120000 integrations/docker/images/chip-build-telink/build.sh delete mode 120000 integrations/docker/images/chip-build-telink/run.sh delete mode 120000 integrations/docker/images/chip-build-telink/version delete mode 120000 integrations/docker/images/chip-build-ti/build.sh delete mode 120000 integrations/docker/images/chip-build-ti/run.sh delete mode 120000 integrations/docker/images/chip-build-ti/version delete mode 120000 integrations/docker/images/chip-build-tizen-qemu/build.sh delete mode 120000 integrations/docker/images/chip-build-tizen-qemu/run.sh delete mode 120000 integrations/docker/images/chip-build-tizen-qemu/version delete mode 120000 integrations/docker/images/chip-build-tizen/build.sh delete mode 120000 integrations/docker/images/chip-build-tizen/run.sh delete mode 120000 integrations/docker/images/chip-build-tizen/version delete mode 120000 integrations/docker/images/chip-build-vscode/build.sh delete mode 120000 integrations/docker/images/chip-build-vscode/run.sh delete mode 120000 integrations/docker/images/chip-build-vscode/version delete mode 120000 integrations/docker/images/chip-build/build.sh delete mode 120000 integrations/docker/images/chip-build/run.sh delete mode 100644 integrations/docker/images/chip-build/version rename integrations/docker/images/{ => stage-1}/chip-build-crosscompile/.gitignore (100%) rename integrations/docker/images/{ => stage-1}/chip-build-crosscompile/Dockerfile (83%) rename integrations/docker/images/{ => stage-1}/chip-build-crosscompile/README.md (100%) create mode 120000 integrations/docker/images/stage-1/chip-build-crosscompile/build.sh create mode 120000 integrations/docker/images/stage-1/chip-build-crosscompile/run.sh create mode 120000 integrations/docker/images/stage-1/chip-build-crosscompile/version rename integrations/docker/images/{ => stage-2}/chip-build-ameba/Dockerfile (85%) create mode 120000 integrations/docker/images/stage-2/chip-build-ameba/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-ameba/run.sh create mode 120000 integrations/docker/images/stage-2/chip-build-ameba/version rename integrations/docker/images/{ => stage-2}/chip-build-asr/Dockerfile (85%) create mode 120000 integrations/docker/images/stage-2/chip-build-asr/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-asr/run.sh create mode 120000 integrations/docker/images/stage-2/chip-build-asr/version create mode 100644 integrations/docker/images/stage-2/chip-build-bouffalolab/Dockerfile create mode 120000 integrations/docker/images/stage-2/chip-build-bouffalolab/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-bouffalolab/run.sh rename integrations/docker/images/{ => stage-2}/chip-build-bouffalolab/setup.sh (100%) create mode 120000 integrations/docker/images/stage-2/chip-build-bouffalolab/version rename integrations/docker/images/{ => stage-2}/chip-build-doxygen/Dockerfile (56%) create mode 120000 integrations/docker/images/stage-2/chip-build-doxygen/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-doxygen/run.sh create mode 120000 integrations/docker/images/stage-2/chip-build-doxygen/version rename integrations/docker/images/{ => stage-2}/chip-build-efr32/Dockerfile (83%) create mode 120000 integrations/docker/images/stage-2/chip-build-efr32/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-efr32/run.sh create mode 120000 integrations/docker/images/stage-2/chip-build-efr32/version rename integrations/docker/images/{ => stage-2}/chip-build-esp32/Dockerfile (76%) create mode 120000 integrations/docker/images/stage-2/chip-build-esp32/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-esp32/run.sh create mode 120000 integrations/docker/images/stage-2/chip-build-esp32/version rename integrations/docker/images/{ => stage-2}/chip-build-imx/Dockerfile (81%) create mode 120000 integrations/docker/images/stage-2/chip-build-imx/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-imx/run.sh create mode 120000 integrations/docker/images/stage-2/chip-build-imx/version rename integrations/docker/images/{ => stage-2}/chip-build-infineon/Dockerfile (74%) create mode 120000 integrations/docker/images/stage-2/chip-build-infineon/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-infineon/run.sh create mode 120000 integrations/docker/images/stage-2/chip-build-infineon/version rename integrations/docker/images/{ => stage-2}/chip-build-java/Dockerfile (75%) create mode 120000 integrations/docker/images/stage-2/chip-build-java/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-java/run.sh create mode 120000 integrations/docker/images/stage-2/chip-build-java/version rename integrations/docker/images/{ => stage-2}/chip-build-k32w/Dockerfile (73%) create mode 120000 integrations/docker/images/stage-2/chip-build-k32w/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-k32w/run.sh create mode 120000 integrations/docker/images/stage-2/chip-build-k32w/version rename integrations/docker/images/{ => stage-2}/chip-build-mbed-os/Dockerfile (66%) create mode 120000 integrations/docker/images/stage-2/chip-build-mbed-os/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-mbed-os/run.sh create mode 120000 integrations/docker/images/stage-2/chip-build-mbed-os/version rename integrations/docker/images/{ => stage-2}/chip-build-nrf-platform/Dockerfile (94%) create mode 120000 integrations/docker/images/stage-2/chip-build-nrf-platform/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-nrf-platform/run.sh create mode 120000 integrations/docker/images/stage-2/chip-build-nrf-platform/version rename integrations/docker/images/{ => stage-2}/chip-build-openiotsdk/Dockerfile (83%) create mode 120000 integrations/docker/images/stage-2/chip-build-openiotsdk/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-openiotsdk/run.sh create mode 120000 integrations/docker/images/stage-2/chip-build-openiotsdk/version rename integrations/docker/images/{ => stage-2}/chip-build-telink/Dockerfile (91%) create mode 120000 integrations/docker/images/stage-2/chip-build-telink/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-telink/run.sh create mode 120000 integrations/docker/images/stage-2/chip-build-telink/version rename integrations/docker/images/{ => stage-2}/chip-build-ti/Dockerfile (81%) create mode 120000 integrations/docker/images/stage-2/chip-build-ti/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-ti/run.sh create mode 120000 integrations/docker/images/stage-2/chip-build-ti/version rename integrations/docker/images/{ => stage-2}/chip-build-tizen/Dockerfile (93%) create mode 120000 integrations/docker/images/stage-2/chip-build-tizen/build.sh create mode 120000 integrations/docker/images/stage-2/chip-build-tizen/run.sh rename integrations/docker/images/{ => stage-2}/chip-build-tizen/tizen-sdk-installer/install.sh (100%) rename integrations/docker/images/{ => stage-2}/chip-build-tizen/tizen-sdk-installer/secret-tool.py (100%) create mode 120000 integrations/docker/images/stage-2/chip-build-tizen/version rename integrations/docker/images/{ => stage-3}/chip-build-android/Dockerfile (95%) create mode 120000 integrations/docker/images/stage-3/chip-build-android/build.sh create mode 120000 integrations/docker/images/stage-3/chip-build-android/run.sh create mode 120000 integrations/docker/images/stage-3/chip-build-android/version rename integrations/docker/images/{ => stage-3}/chip-build-esp32-qemu/Dockerfile (84%) create mode 120000 integrations/docker/images/stage-3/chip-build-esp32-qemu/build.sh create mode 120000 integrations/docker/images/stage-3/chip-build-esp32-qemu/run.sh create mode 120000 integrations/docker/images/stage-3/chip-build-esp32-qemu/version rename integrations/docker/images/{ => stage-3}/chip-build-tizen-qemu/Dockerfile (98%) create mode 120000 integrations/docker/images/stage-3/chip-build-tizen-qemu/build.sh rename integrations/docker/images/{ => stage-3}/chip-build-tizen-qemu/files/0001-smack-add-permissive-mode.patch (100%) create mode 120000 integrations/docker/images/stage-3/chip-build-tizen-qemu/run.sh create mode 120000 integrations/docker/images/stage-3/chip-build-tizen-qemu/version rename integrations/docker/images/{ => vscode}/chip-build-vscode/Dockerfile (75%) create mode 120000 integrations/docker/images/vscode/chip-build-vscode/build.sh create mode 120000 integrations/docker/images/vscode/chip-build-vscode/run.sh create mode 120000 integrations/docker/images/vscode/chip-build-vscode/version create mode 100755 scripts/helpers/roll_docker_version.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3c7a97ae658170..ff773c6f51e05d 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -15,7 +15,8 @@ ARG BUILD_VERSION # All tools required for compilation belong in chip-build, forms "truth" for CHIP build tooling -FROM connectedhomeip/chip-build-vscode:${BUILD_VERSION} +FROM ghcr.io/project-chip/chip-build-vscode:${BUILD_VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip # This Dockerfile contains things useful for an interactive development environment ARG USERNAME=vscode diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1db4f5be0075bf..f738660104089f 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 0.7.25", + "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 1", "image": "matter-dev-environment:local", "remoteUser": "vscode", "customizations": { diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt index 33d3b335cfc2d6..9fc6223cd933e3 100644 --- a/.github/.wordlist.txt +++ b/.github/.wordlist.txt @@ -590,6 +590,7 @@ getManualTests getstarted getTests GH +ghcr ghp githubusercontent gitignore diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml index 97863c8c0e1c47..a1d7afbd9b00a3 100644 --- a/.github/workflows/bloat_check.yaml +++ b/.github/workflows/bloat_check.yaml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 steps: - name: Checkout diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f3b85d4349840d..66403d723e3101 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -40,7 +40,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 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: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -275,7 +275,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 volumes: - "/tmp/log_output:/tmp/test_logs" options: --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -397,7 +397,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 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 4d31f53ca75eb3..4d16e09457bb88 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -33,7 +33,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 options: --user root steps: @@ -54,7 +54,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-esp32:0.7.25 + image: ghcr.io/project-chip/chip-build-esp32:1 options: --user root steps: @@ -75,7 +75,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-nrf-platform:0.7.25 + image: ghcr.io/project-chip/chip-build-nrf-platform:1 options: --user root steps: diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml deleted file mode 100644 index 0828f514c07bf7..00000000000000 --- a/.github/workflows/cirque.yaml +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright (c) 2020 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -name: Cirque - -on: - push: - pull_request: - merge_group: - workflow_dispatch: - -concurrency: - group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }} - cancel-in-progress: true - -env: - CHIP_NO_LOG_TIMESTAMPS: true - -jobs: - cirque: - name: Cirque - - env: - DOCKER_RUN_VERSION: 0.7.25 - GITHUB_CACHE_PATH: /tmp/cirque-cache - - runs-on: ubuntu-latest - if: github.actor != 'restyled-io[bot]' - - # need to run with privilege, which isn't supported by job.XXX.contaner - # https://github.com/actions/container-action/issues/2 - # container: - # image: connectedhomeip/chip-build-cirque:0.7.25 - # volumes: - # - "/tmp:/tmp" - # - "/dev/pts:/dev/pts" - # env: - # LOG_DIR: /tmp/cirque_test_output/ - # CLEANUP_DOCKER_FOR_CI: 1 - # options: "--privileged" - - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Checkout submodules - uses: ./.github/actions/checkout-submodules - with: - platform: linux - - - name: Bootstrap Cache - uses: ./.github/actions/bootstrap-cache - - name: Bootstrap - run: | - integrations/docker/images/chip-build-cirque/run.sh \ - -- sh -c " \ - git config --global --add safe.directory '*' \ - && bash scripts/bootstrap.sh \ - && chown -R $(id -u):$(id -g) .environment \ - " - - - name: Get Cirque Bootstrap cache key - id: cirque-bootstrap-cache-key - run: echo "val=$(scripts/tests/cirque_tests.sh cachekeyhash)" >> $GITHUB_OUTPUT - - uses: Wandalen/wretry.action@v1.3.0 - name: Cirque Bootstrap cache - if: ${{ !env.ACT }} - continue-on-error: true - timeout-minutes: 10 - with: - action: buildjet/cache@v3 - attempt_limit: 3 - attempt_delay: 2000 - with: | - key: ${{ runner.os }}-cirque-${{ steps.cirque-bootstrap-cache-key.outputs.val }} - restore-keys: ${{ runner.os }}-cirque- - path: ${{ env.GITHUB_CACHE_PATH }} - - name: Cirque Bootstrap - run: | - integrations/docker/images/chip-build-cirque/run.sh \ - --env GITHUB_ACTION_RUN=1 \ - --env GITHUB_CACHE_PATH=${{ env.GITHUB_CACHE_PATH }} \ - --volume /tmp:/tmp \ - -- scripts/tests/cirque_tests.sh bootstrap - - - name: Artifact suffix - id: outsuffix - uses: haya14busa/action-cond@v1 - if: ${{ !env.ACT }} - with: - cond: ${{ github.event.pull_request.number == '' }} - if_true: "${{ github.sha }}" - if_false: "pull-${{ github.event.pull_request.number }}" - - name: Build Binaries - run: | - integrations/docker/images/chip-build-cirque/run.sh \ - -- sh -c " \ - git config --global --add safe.directory '*' \ - && scripts/build/gn_gen_cirque.sh \ - " - - name: Run Tests - run: | - integrations/docker/images/chip-build-cirque/run.sh \ - --env LOG_DIR=/tmp/cirque_test_output \ - --env CLEANUP_DOCKER_FOR_CI=1 \ - --env GITHUB_ACTION_RUN=1 \ - --privileged \ - --volume /tmp:/tmp \ - --volume /dev/pts:/dev/pts \ - -- scripts/tests/cirque_tests.sh run_all_tests - - - name: Uploading Binaries - uses: actions/upload-artifact@v3 - if: ${{ always() && !env.ACT }} - with: - name: cirque_log-${{steps.outsuffix.outputs.value}}-logs - path: /tmp/cirque_test_output/ diff --git a/.github/workflows/docker_img.yaml b/.github/workflows/docker_img.yaml index 150922d984fb08..f01d7d459091ee 100644 --- a/.github/workflows/docker_img.yaml +++ b/.github/workflows/docker_img.yaml @@ -15,17 +15,28 @@ name: Docker CHIP images on: + workflow_call: + inputs: + push_images: + required: false + type: boolean + default: false push: paths: - - "integrations/docker/images/**" + - "integrations/docker/**" pull_request: paths: - - "integrations/docker/images/**" + - "integrations/docker/**" workflow_dispatch: - + inputs: + push_images: + required: false + type: boolean + default: false + jobs: - build_images: - name: Build Docker CHIP Build images + build_images_base: + name: Build Docker CHIP Build images - base runs-on: ubuntu-latest if: github.actor != 'restyled-io[bot]' strategy: @@ -33,32 +44,129 @@ jobs: matrix: img: - "" - - "-ameba" - - "-android" - - "-cirque" + - "-minimal" + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Build images using project bash script + if: ${{ inputs.push_images == true }} + run: | + cd integrations/docker/images/base/chip-build${{ matrix.img }} + ./build.sh --latest --push + - name: Build & Push images using project bash script + if: ${{ inputs.push_images == false }} + run: | + cd integrations/docker/images/base/chip-build${{ matrix.img }} + ./build.sh --latest + build_images_stage_1: + needs: [build_images_base] + name: Build Docker CHIP Build images - stage 1 + runs-on: ubuntu-latest + if: github.actor != 'restyled-io[bot]' + strategy: + fail-fast: false + matrix: + img: - "-crosscompile" + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Build images using project bash script + if: ${{ inputs.push_images == true }} + run: | + cd integrations/docker/images/stage-1/chip-build${{ matrix.img }} + ./build.sh --latest --push + - name: Build & Push images using project bash script + if: ${{ inputs.push_images == false }} + run: | + cd integrations/docker/images/stage-1/chip-build${{ matrix.img }} + ./build.sh --latest + build_images_stage_2: + needs: [build_images_base, build_images_stage_1] + name: Build Docker CHIP Build images - stage 2 + runs-on: ubuntu-latest + if: github.actor != 'restyled-io[bot]' + strategy: + fail-fast: false + matrix: + img: + - "-ameba" + - "-asr" + - "-bouffalolab" - "-doxygen" - "-efr32" - "-esp32" - - "-esp32-qemu" - "-infineon" # NOTE: imx image requires too much space for GitHub-hosted runners. It fails with: # ApplyLayer exit status 1 stdout: stderr: write /opt/fsl-imx-xwayland/5.15-kirkstone/sysroots/armv8a-poky-linux/opt/ltp/testcases/bin/fanotify15: no space left on device # - "-imx" + - "-java" - "-k32w" - "-mbed-os" - "-nrf-platform" - "-telink" - "-ti" - "-tizen" - - "-tizen-qemu" - "-openiotsdk" - # NOTE: vscode image consumes ~52 GB disk space but GitHub-hosted runners provide ~10 GB free disk space(https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources) - #- "-vscode" steps: - name: Checkout uses: actions/checkout@v3 - - name: Build All images using project bash script + - name: Build images using project bash script + if: ${{ inputs.push_images == true }} + run: | + cd integrations/docker/images/stage-2/chip-build${{ matrix.img }} + ./build.sh --latest --push + - name: Build & Push images using project bash script + if: ${{ inputs.push_images == false }} + run: | + cd integrations/docker/images/stage-2/chip-build${{ matrix.img }} + ./build.sh --latest + + build_images_stage_3: + needs: [build_images_base, build_images_stage_1, build_images_stage_2] + name: Build Docker CHIP Build images - stage 3 + runs-on: ubuntu-latest + if: github.actor != 'restyled-io[bot]' + strategy: + fail-fast: false + matrix: + img: + - "-android" + - "-esp32-qemu" + - "-tizen-qemu" + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Build images using project bash script + if: ${{ inputs.push_images == true }} + run: | + cd integrations/docker/images/stage-3/chip-build${{ matrix.img }} + ./build.sh --latest --push + - name: Build & Push images using project bash script + if: ${{ inputs.push_images == false }} + run: | + cd integrations/docker/images/stage-3/chip-build${{ matrix.img }} + ./build.sh --latest + build_images_vscode: + needs: [build_images_base, build_images_stage_1, build_images_stage_2, build_images_stage_3] + name: Build Docker CHIP Build images - vscode + runs-on: ubuntu-latest + if: github.actor != 'restyled-io[bot]' && false + strategy: + fail-fast: false + matrix: + img: + - "-vscode" + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Build images using project bash script + if: ${{ inputs.push_images == true }} + run: | + cd integrations/docker/images/vscode/chip-build${{ matrix.img }} + ./build.sh --latest --push + - name: Build & Push images using project bash script + if: ${{ inputs.push_images == false }} run: | - cd integrations/docker/images/chip-build${{ matrix.img }} + cd integrations/docker/images/vscode-3/chip-build${{ matrix.img }} ./build.sh --latest diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml index e5bda8423422eb..9a25537b8834b1 100644 --- a/.github/workflows/doxygen.yaml +++ b/.github/workflows/doxygen.yaml @@ -81,7 +81,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build-doxygen:0.7.25 + image: ghcr.io/project-chip/chip-build-doxygen:1 if: github.actor != 'restyled-io[bot]' diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml index a7d8d3899ab287..c4c164f880cd0c 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: connectedhomeip/chip-build-ameba:0.7.25 + image: ghcr.io/project-chip/chip-build-ameba:1 options: --user root steps: diff --git a/.github/workflows/examples-asr.yaml b/.github/workflows/examples-asr.yaml index d94728044560aa..c39724bcdbdd87 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: connectedhomeip/chip-build-asr:0.7.25 + image: ghcr.io/project-chip/chip-build-asr:1 options: --user root steps: diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml index f92eab14b51822..69399f966feadf 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: connectedhomeip/chip-build-bouffalolab:0.7.25 + image: ghcr.io/project-chip/chip-build-bouffalolab:1 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 0c51c4000f92d8..608465bc12f345 100644 --- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml +++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml @@ -39,7 +39,7 @@ jobs: if: github.actor != 'restyled-io[bot]' && false container: - image: connectedhomeip/chip-build-ti:0.7.25 + image: ghcr.io/project-chip/chip-build-ti:1 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml index beb56d975d2a21..aeb32d23f6641a 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: connectedhomeip/chip-build-ti:0.7.25 + image: ghcr.io/project-chip/chip-build-ti:1 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index 9a3840a9ff55e7..141033ffc2a4bd 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: connectedhomeip/chip-build-efr32:0.7.25 + image: ghcr.io/project-chip/chip-build-efr32:1 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml index 0b2b69b74a0b9e..37f27dade5eca7 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: connectedhomeip/chip-build-esp32:0.7.25 + image: ghcr.io/project-chip/chip-build-esp32:1 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" @@ -127,7 +127,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-esp32:0.7.25 + image: ghcr.io/project-chip/chip-build-esp32:1 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml index 40d12064a3147b..6a733159aac313 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: connectedhomeip/chip-build-infineon:0.7.25 + image: ghcr.io/project-chip/chip-build-infineon:1 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml index 96c8c74e56d697..19b772bd52ab6c 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: connectedhomeip/chip-build-k32w:0.7.25 + image: ghcr.io/project-chip/chip-build-k32w:1 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 020b44b8fa31a4..f6e6d917f57940 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: connectedhomeip/chip-build-crosscompile:0.7.25 + image: ghcr.io/project-chip/chip-build-crosscompile:1 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml index 65cfb59588e5bb..28521ff204b599 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: connectedhomeip/chip-build-imx:0.7.25 + image: ghcr.io/project-chip/chip-build-imx:1 steps: - name: Checkout diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml index 7a7c683b6f2c76..86abe5b25d8dfa 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: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml index 2149eadcffde87..76cb3b3a4589ad 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: connectedhomeip/chip-build-mbed-os:0.7.25 + image: ghcr.io/project-chip/chip-build-mbed-os:1 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml index b334fddd71df8a..7f0c46f9abd56e 100755 --- 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: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml index b747e90c244e67..18a8aa9836c3cf 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: connectedhomeip/chip-build-nrf-platform:0.7.25 + image: ghcr.io/project-chip/chip-build-nrf-platform:1 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml index 122c347cb278a4..338067b53cbe63 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: connectedhomeip/chip-build-openiotsdk:0.7.25 + image: ghcr.io/project-chip/chip-build-openiotsdk:1 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" options: --privileged diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml index 34dfe4a289c6fc..228f2a32809d55 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: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index 2581a817950295..6e362081b9f35a 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: connectedhomeip/chip-build-telink:0.7.25 + image: ghcr.io/project-chip/chip-build-telink:1 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml index 927600384886e0..be99cb029bb293 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: connectedhomeip/chip-build-tizen:0.7.25 + image: ghcr.io/project-chip/chip-build-tizen:1 options: --user root volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index ce3209a915e46f..5816b6b1dfbba0 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-android:0.7.25 + image: ghcr.io/project-chip/chip-build-android:1 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml index 5a756b5d243c33..7e83a81209a32e 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: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index 3061bea633bf93..08b9c5d8cb9211 100644 --- a/.github/workflows/java-tests.yaml +++ b/.github/workflows/java-tests.yaml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build-java:0.7.25 + 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" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5c2a7441b08ad9..6bc7d403c2f491 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -29,7 +29,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.6.47 + image: ghcr.io/project-chip/chip-build:0.8 steps: - name: Checkout diff --git a/.github/workflows/minimal-build.yaml b/.github/workflows/minimal-build.yaml index 7b64073a736566..794d108446fa4d 100644 --- a/.github/workflows/minimal-build.yaml +++ b/.github/workflows/minimal-build.yaml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build-minimal:0.7.18 + image: ghcr.io/project-chip/chip-build-minimal:1 steps: - name: Checkout diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml index 5b8c27d7d90a02..b20d87e391cb28 100644 --- a/.github/workflows/qemu.yaml +++ b/.github/workflows/qemu.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-esp32-qemu:0.7.25 + image: ghcr.io/project-chip/chip-build-esp32-qemu:1 volumes: - "/tmp/log_output:/tmp/test_logs" @@ -76,7 +76,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-tizen-qemu:0.7.18 + image: ghcr.io/project-chip/chip-build-tizen-qemu:1 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml index b816036911cc0f..a6c14d8401a5c2 100644 --- a/.github/workflows/release_artifacts.yaml +++ b/.github/workflows/release_artifacts.yaml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build-esp32:0.7.25 + image: ghcr.io/project-chip/chip-build-esp32:1 steps: - name: Checkout @@ -68,7 +68,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build-efr32:0.7.25 + image: ghcr.io/project-chip/chip-build-efr32:1 steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/roll_and_build_docker.yaml b/.github/workflows/roll_and_build_docker.yaml new file mode 100644 index 00000000000000..7d94d71cf12204 --- /dev/null +++ b/.github/workflows/roll_and_build_docker.yaml @@ -0,0 +1,15 @@ +name: Manually Roll, Build, and Push Docker Images +on: + workflow_dispatch: +jobs: + roll_version: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Roll docker versions + run: ./scripts/helpers/roll_docker_version.sh ./integrations/docker/images/base/chip-build/version + - uses: EndBug/add-and-commit@v9 + with: + default_author: github_actions + message: Rolling Docker Version diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index 208a859692c536..971fbd12493f24 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-android:0.7.25 + image: ghcr.io/project-chip/chip-build-android:1 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index d98df0aca7c641..b796e0fd859b19 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" @@ -406,7 +406,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 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 c54325c0f9922b..d800d27ed040f6 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: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 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 f98ee8eeb6c7d3..d15cbc5f004f29 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: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 defaults: run: shell: sh diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml index d2728229786726..0e6033035f7297 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: connectedhomeip/chip-build:0.7.25 + image: ghcr.io/project-chip/chip-build:1 defaults: run: shell: sh diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md index a710a2e5e006f9..656c35cb2998af 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 connectedhomeip/chip-build-ameba:latest + $ docker pull ghcr.io/project-chip/chip-build-ameba:latest - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip connectedhomeip/chip-build-ameba:latest + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:latest - Setup build environment: diff --git a/examples/all-clusters-app/telink/Readme.md b/examples/all-clusters-app/telink/Readme.md index aaea384d83b4c5..6a646341c3e359 100644 --- a/examples/all-clusters-app/telink/Readme.md +++ b/examples/all-clusters-app/telink/Readme.md @@ -11,13 +11,13 @@ 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:latest ``` 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:latest ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/all-clusters-minimal-app/ameba/README.md b/examples/all-clusters-minimal-app/ameba/README.md index 3c51bc43cabda9..467d15b3be73e4 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 connectedhomeip/chip-build-ameba:latest + $ docker pull ghcr.io/project-chip/chip-build-ameba:latest ``` - Run docker container: ``` - $ docker run -it -v ${CHIP_DIR}:/root/chip connectedhomeip/chip-build-ameba:latest + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:latest ``` - Setup build environment: diff --git a/examples/all-clusters-minimal-app/telink/Readme.md b/examples/all-clusters-minimal-app/telink/Readme.md index 1051c077a3ed11..5531070453de45 100644 --- a/examples/all-clusters-minimal-app/telink/Readme.md +++ b/examples/all-clusters-minimal-app/telink/Readme.md @@ -11,13 +11,13 @@ 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:latest ``` 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:latest ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/bridge-app/linux/Dockerfile b/examples/bridge-app/linux/Dockerfile index 965e82a664266c..4ee91d7f2f7d98 100644 --- a/examples/bridge-app/linux/Dockerfile +++ b/examples/bridge-app/linux/Dockerfile @@ -15,7 +15,8 @@ # limitations under the License. # -FROM connectedhomeip/chip-cirque-device-base:latest +FROM ghcr.io/project-chip/chip-cirque-device-base:latest +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip COPY out/debug/chip-bridge-app /usr/bin/ COPY entrypoint.sh / diff --git a/examples/bridge-app/telink/README.md b/examples/bridge-app/telink/README.md index 34ce68e54edb3d..9055e4c7c3a669 100644 --- a/examples/bridge-app/telink/README.md +++ b/examples/bridge-app/telink/README.md @@ -88,13 +88,13 @@ defined: 1. Pull docker image from repository: ```bash - $ docker pull connectedhomeip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:latest ``` 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:latest ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/chef/README.md b/examples/chef/README.md index ac51d529d19b60..b9218bf5de5d55 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 connectedhomeip/chip-build-$PLATFORM:$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: connectedhomeip/chip-build-$PLATFORM:$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 connectedhomeip/chip-build-vscode:$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 c9ec416437e6cb..ef1dec634e3905 100644 --- a/examples/chip-tool/Dockerfile +++ b/examples/chip-tool/Dockerfile @@ -15,7 +15,8 @@ # limitations under the License. # -FROM connectedhomeip/chip-cirque-device-base:latest +FROM ghcr.io/project-chip/chip-cirque-device-base:latest +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip COPY out/debug/chip-tool /usr/bin/ COPY entrypoint.sh / diff --git a/examples/contact-sensor-app/telink/README.md b/examples/contact-sensor-app/telink/README.md index 68475be1d69c9b..22933e4fd4f4ba 100755 --- a/examples/contact-sensor-app/telink/README.md +++ b/examples/contact-sensor-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:latest ``` 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:latest ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/light-switch-app/ameba/README.md b/examples/light-switch-app/ameba/README.md index 9959ff0c1f8581..8c24568a1b54d2 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 connectedhomeip/chip-build-ameba:latest + $ docker pull ghcr.io/project-chip/chip-build-ameba:latest - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip connectedhomeip/chip-build-ameba:latest + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:latest - Setup build environment: diff --git a/examples/light-switch-app/telink/README.md b/examples/light-switch-app/telink/README.md index 76f62c6db681ee..32429c84743f9c 100755 --- a/examples/light-switch-app/telink/README.md +++ b/examples/light-switch-app/telink/README.md @@ -14,13 +14,13 @@ 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:latest ``` 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:latest ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/lighting-app/ameba/README.md b/examples/lighting-app/ameba/README.md index 77b7fb016b644a..45c30db736070f 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 connectedhomeip/chip-build-ameba:latest + $ docker pull ghcr.io/project-chip/chip-build-ameba:latest - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip connectedhomeip/chip-build-ameba:latest + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:latest - Setup build environment: diff --git a/examples/lighting-app/linux/Dockerfile b/examples/lighting-app/linux/Dockerfile index 14daa71ae25332..b84e9913800075 100644 --- a/examples/lighting-app/linux/Dockerfile +++ b/examples/lighting-app/linux/Dockerfile @@ -15,7 +15,8 @@ # limitations under the License. # -FROM connectedhomeip/chip-cirque-device-base:latest +FROM ghcr.io/project-chip/chip-cirque-device-base:latest +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip COPY out/debug/chip-lighting-app /usr/bin/ COPY entrypoint.sh / diff --git a/examples/lighting-app/telink/README.md b/examples/lighting-app/telink/README.md index ddb536496e77bc..a76f539f0f2b17 100644 --- a/examples/lighting-app/telink/README.md +++ b/examples/lighting-app/telink/README.md @@ -12,13 +12,13 @@ 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:latest ``` 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:latest ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/lock-app/telink/README.md b/examples/lock-app/telink/README.md index d6eefac21b5fdd..2715a195d3b387 100755 --- a/examples/lock-app/telink/README.md +++ b/examples/lock-app/telink/README.md @@ -12,13 +12,13 @@ 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:latest ``` 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:latest ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/ota-requestor-app/ameba/README.md b/examples/ota-requestor-app/ameba/README.md index 029cbed876b7ba..ef18e95eabbf8d 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 connectedhomeip/chip-build-ameba:latest + $ docker pull ghcr.io/project-chip/chip-build-ameba:latest - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip connectedhomeip/chip-build-ameba:latest + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:latest - Setup build environment: diff --git a/examples/ota-requestor-app/telink/Readme.md b/examples/ota-requestor-app/telink/Readme.md index b1f2947a4e3a1b..aa5060c0b18172 100755 --- a/examples/ota-requestor-app/telink/Readme.md +++ b/examples/ota-requestor-app/telink/Readme.md @@ -5,13 +5,13 @@ 1. Pull docker image from repository: ```bash - $ docker pull connectedhomeip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:latest ``` 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:latest ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/pigweed-app/ameba/README.md b/examples/pigweed-app/ameba/README.md index 09319a508b4bc8..8e3e2513c05550 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 connectedhomeip/chip-build-ameba:latest + $ docker pull ghcr.io/project-chip/chip-build-ameba:latest - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip connectedhomeip/chip-build-ameba:latest + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:latest - Setup build environment: diff --git a/examples/pump-app/telink/README.md b/examples/pump-app/telink/README.md index 19bdcc291e5fb6..9fb9ca20b2ee1b 100755 --- a/examples/pump-app/telink/README.md +++ b/examples/pump-app/telink/README.md @@ -13,13 +13,13 @@ reference for creating your own pump application. 1. Pull docker image from repository: ```bash - $ docker pull connectedhomeip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:latest ``` 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:latest ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/pump-controller-app/telink/README.md b/examples/pump-controller-app/telink/README.md index 253b676e7392fa..bbf5ced1975488 100755 --- a/examples/pump-controller-app/telink/README.md +++ b/examples/pump-controller-app/telink/README.md @@ -14,13 +14,13 @@ your own pump application. 1. Pull docker image from repository: ```bash - $ docker pull connectedhomeip/chip-build-telink:latest + $ docker pull ghcr.io/project-chip/chip-build-telink:latest ``` 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:latest ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/temperature-measurement-app/telink/README.md b/examples/temperature-measurement-app/telink/README.md index 4b33ad843c7e84..6e2e7850735b72 100644 --- a/examples/temperature-measurement-app/telink/README.md +++ b/examples/temperature-measurement-app/telink/README.md @@ -13,13 +13,13 @@ 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:latest ``` 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:latest ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/thermostat/telink/Readme.md b/examples/thermostat/telink/Readme.md index 9b097c02ad9611..bc60f34b528a71 100755 --- a/examples/thermostat/telink/Readme.md +++ b/examples/thermostat/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:latest ``` 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:latest ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/examples/window-app/telink/README.md b/examples/window-app/telink/README.md index d8e02132cd6bec..cc4a63d926b696 100644 --- a/examples/window-app/telink/README.md +++ b/examples/window-app/telink/README.md @@ -12,13 +12,13 @@ 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:latest ``` 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:latest ``` here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay diff --git a/integrations/README.md b/integrations/README.md index f5d993b05ad4f5..f08c5dd078f700 100644 --- a/integrations/README.md +++ b/integrations/README.md @@ -2,6 +2,3 @@ /integrations are collections of scripts, configurations, and other glue for interacting with tools, services, etc. - -The `ci-only-images` contains images that is used for CI only, and will not be -pushed to docker hub. diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml index 9a9c4aa8fd5c9f..2d3ecd1b38e95a 100644 --- a/integrations/cloudbuild/chef.yaml +++ b/integrations/cloudbuild/chef.yaml @@ -42,9 +42,21 @@ steps: - name: "gcr.io/cloud-builders/docker" args: - ['/workspace/examples/chef/create_docker.py', '--commit_sha', '$COMMIT_SHA' ,'--short_sha', '$SHORT_SHA', - '--revision_id', '$REVISION_ID', '--build_id', '$BUILD_ID', '--image_name', '$_DOCKER_IMAGE_NAME', - '--tar_path', '/workspace/artifacts'] + [ + "/workspace/examples/chef/create_docker.py", + "--commit_sha", + "$COMMIT_SHA", + "--short_sha", + "$SHORT_SHA", + "--revision_id", + "$REVISION_ID", + "--build_id", + "$BUILD_ID", + "--image_name", + "$_DOCKER_IMAGE_NAME", + "--tar_path", + "/workspace/artifacts", + ] id: DockerAll entrypoint: python3 waitFor: diff --git a/integrations/docker/images/build-all.sh b/integrations/docker/build-all.sh similarity index 50% rename from integrations/docker/images/build-all.sh rename to integrations/docker/build-all.sh index 4aff2747ed571a..1d4f48cdabeb7b 100755 --- a/integrations/docker/images/build-all.sh +++ b/integrations/docker/build-all.sh @@ -20,9 +20,38 @@ # temporary wrapper build script until we can build something better # https://github.com/project-chip/connectedhomeip/issues/710 # + set -e -find "$(git rev-parse --show-toplevel)"/integrations/docker/images/ -name Dockerfile ! -path "*chip-cert-bins/*" | while read -r dockerfile; do - pushd "$(dirname "$dockerfile")" >/dev/null - ./build.sh "$@" - popd >/dev/null + +SUB_PATH="*" +ALL_ARGS="" + +for i in "$@"; do + case $i in + -p=* | --path=*) + SUB_PATH="${i#*=}" + ;; + *) + ALL_ARGS="$ALL_ARGS ${i#*=}" + ;; + esac done + +echo "SUB_PATH: $SUB_PATH" + +function build_image() { + PARSE_PATH=$1 + ARGS_TO_PASS=$2 + + echo "PARSE_PATH: $PARSE_PATH" + echo "ARGS_TO_PASS: $ARGS_TO_PASS" + + find "$(git rev-parse --show-toplevel)"/integrations/docker/images/"$PARSE_PATH" -name Dockerfile ! -path "*chip-cert-bins/*" | while read -r dockerfile; do + echo "$(dirname "$dockerfile")" + pushd "$(dirname "$dockerfile")" >/dev/null + ./build.sh "$ARGS_TO_PASS" + popd >/dev/null + done +} + +build_image "$SUB_PATH" "$ALL_ARGS" diff --git a/integrations/docker/build.sh b/integrations/docker/build.sh index fefbbadba32bd0..db1976da538a35 100755 --- a/integrations/docker/build.sh +++ b/integrations/docker/build.sh @@ -25,7 +25,8 @@ me=$(basename "$0") cd "$(dirname "$0")" -ORG=${DOCKER_BUILD_ORG:-connectedhomeip} +GHCR_ORG="ghcr.io" +ORG=${DOCKER_BUILD_ORG:-project-chip} # directory name is IMAGE=${DOCKER_BUILD_IMAGE:-$(basename "$(pwd)")} @@ -73,7 +74,7 @@ if [ -f "$DOCKER_VOLUME_PATH" ]; then fi # go find and build any CHIP images this image is "FROM" -awk -F/ '/^FROM connectedhomeip/ {print $2}' Dockerfile | while read -r dep; do +awk -F/ '/^FROM project-chip/ {print $2}' Dockerfile | while read -r dep; do dep=${dep%:*} (cd "../$dep" && ./build.sh "$@") done @@ -84,27 +85,35 @@ if [[ ${*/--no-cache//} != "${*}" ]]; then fi [[ ${*/--skip-build//} != "${*}" ]] || { - docker build "${BUILD_ARGS[@]}" --build-arg TARGETPLATFORM="$TARGET_PLATFORM_TYPE" --build-arg VERSION="$VERSION" -t "$ORG/$IMAGE:$VERSION" . + docker build "${BUILD_ARGS[@]}" --build-arg TARGETPLATFORM="$TARGET_PLATFORM_TYPE" --build-arg VERSION="$VERSION" -t "$GHCR_ORG/$ORG/$IMAGE:$VERSION" . docker image prune --force } [[ ${*/--latest//} != "${*}" ]] && { - docker tag "$ORG"/"$IMAGE":"$VERSION" "$ORG"/"$IMAGE":latest + docker tag "$GHCR_ORG"/"$ORG"/"$IMAGE":"$VERSION" "$GHCR_ORG"/"$ORG"/"$IMAGE":latest } [[ ${*/--squash//} != "${*}" ]] && { command -v docker-squash >/dev/null && - docker-squash "$ORG"/"$IMAGE":"$VERSION" -t "$ORG"/"$IMAGE":latest + docker-squash "$GHCR_ORG"/"$ORG"/"$IMAGE":"$VERSION" -t "$GHCR_ORG"/"$ORG"/"$IMAGE":latest } [[ ${*/--push//} != "${*}" ]] && { - docker push "$ORG"/"$IMAGE":"$VERSION" + docker push "$GHCR_ORG"/"$ORG"/"$IMAGE":"$VERSION" [[ ${*/--latest//} != "${*}" ]] && { - docker push "$ORG"/"$IMAGE":latest + docker push "$GHCR_ORG"/"$ORG"/"$IMAGE":latest } } -docker images --filter=reference="$ORG/*" +[[ ${*/--clear//} != "${*}" ]] && { + docker rmi -f "$GHCR_ORG"/"$ORG"/"$IMAGE":"$VERSION" + [[ ${*/--latest//} != "${*}" ]] && { + docker rmi -f "$GHCR_ORG"/"$ORG"/"$IMAGE":latest + } +} + +docker images --filter=reference="$GHCR_ORG/$ORG/*" + if [ -f "$DOCKER_VOLUME_PATH" ]; then df -h "$DOCKER_VOLUME_PATH" mb_space_after=$(df -m "$DOCKER_VOLUME_PATH" | awk 'FNR==2{print $3}') diff --git a/integrations/docker/ci-only-images/chip-cirque-device-base/CHIPCirqueDaemon.py b/integrations/docker/ci-only-images/chip-cirque-device-base/CHIPCirqueDaemon.py deleted file mode 100755 index a96868a4593c67..00000000000000 --- a/integrations/docker/ci-only-images/chip-cirque-device-base/CHIPCirqueDaemon.py +++ /dev/null @@ -1,138 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright (c) 2020 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import logging -import subprocess -import sys -import time -from dataclasses import dataclass -from enum import Enum -from multiprocessing.connection import Client, Listener -from pathlib import Path - -import click - -log = logging.getLogger() -log.setLevel(logging.DEBUG) - -sh = logging.StreamHandler() -sh.setFormatter( - logging.Formatter( - '%(asctime)s [%(name)s] %(levelname)s %(message)s')) -log.addHandler(sh) - - -class CommandStatus(Enum): - """Enum class for passing status code of execute CirqueDaemon command, not CHIP error codes.""" - SUCCESS = 0 - FAILURE = 1 - UNKNOWN_COMMAND = 2 - INVALID_ARGUMENT = 3 - - -@dataclass -class CommandResponse: - """Class for holding status of running CirqueDaemon commands.""" - status_code: CommandStatus - error_message: str = "" - - -class ShellCommand: - def __init__(self, args=None): - self._args = args - - def __call__(self): - if not self._args: - return CommandResponse(CommandStatus.INVALID_ARGUMENT, "Cannot spwan background process") - log.info("Will run command: {}".format(self._args)) - try: - # As the command will be execued in background, we won't return the exit code of the program. - subprocess.Popen( - self._args, stdout=sys.stdout, stderr=sys.stderr) - return CommandResponse(CommandStatus.SUCCESS) - except Exception as ex: - return CommandResponse(CommandStatus.FAILURE, "Failed to run command: {}".format(ex)) - - -class InvalidCommand: - def __init__(self, args=None): - self._args = args - - def __call__(self): - return CommandResponse(CommandStatus.FAILURE, "invalid command") - - -SERVER_ADDRESS = "/tmp/cirque-helper.socket" -CLIENT_WAIT_TIMEOUT_SECONDS = 5 - - -def CommandFactory(args): - commands = { - "run": ShellCommand - } - if len(args) == 0: - return InvalidCommand() - return commands.get(args[0], InvalidCommand)(args[1:]) - - -def ServerMain(args): - extraOptions = { - "otbr-agent": ShellCommand(["otbr-agent", "-I", "wpan0", "-B", "eth0", "spinel+hdlc+uart:///dev/ttyUSB0"]) - } - - with Listener(SERVER_ADDRESS) as listener: - log.info("Server running on {}".format(SERVER_ADDRESS)) - for extraOption in args: - cmd = extraOptions.get(extraOption, InvalidCommand()) - cmd() - - while True: - with listener.accept() as conn: - log.info("Received connection") - cmd = CommandFactory(conn.recv()) - conn.send(cmd()) - - -def ClientMain(args): - if len(args) == 0: - sys.exit(1) - # The server may start very slowly, wait for a few seconds to see if the server will start. - for _ in range(CLIENT_WAIT_TIMEOUT_SECONDS): - socks = Path(SERVER_ADDRESS) - if socks.exists(): - break - time.sleep(1) - # If the address does not exist, Client constructor will throw an exception, so no need to add a flag. - with Client(SERVER_ADDRESS) as conn: - conn.send(args) - res = conn.recv() - print(res) - if res.status_code != CommandStatus.SUCCESS: - sys.exit(1) - - -@click.command() -@click.option('--server', is_flag=True) -@click.argument('command', nargs=-1) -def main(server, command): - if server: - ServerMain(command) - else: - ClientMain(command) - - -if __name__ == '__main__': - main() diff --git a/integrations/docker/ci-only-images/chip-cirque-device-base/Dockerfile b/integrations/docker/ci-only-images/chip-cirque-device-base/Dockerfile deleted file mode 100644 index 465723a5dda193..00000000000000 --- a/integrations/docker/ci-only-images/chip-cirque-device-base/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -FROM ubuntu:focal - -ARG OT_BR_POSIX_CHECKOUT=master - -ENV DEBIAN_FRONTEND noninteractive -ENV PLATFORM ubuntu -ENV DOCKER 1 -ENV OT_BR_POSIX_CHECKOUT=${OT_BR_POSIX_CHECKOUT} - -RUN mkdir /app - -WORKDIR /app - -RUN apt-cache policy - -# TODO: Use multi stage build for smaller image size. -RUN apt-get update \ - && apt-get install --no-install-recommends -y \ - avahi-daemon \ - avahi-utils \ - ca-certificates \ - dhcpcd5 \ - gdb \ - git \ - iproute2 \ - libavahi-client3 \ - libcairo2-dev \ - libdbus-1-dev \ - libgif-dev \ - libgirepository1.0-dev \ - libglib2.0-dev \ - libjpeg-dev \ - psmisc \ - python3-dev \ - python3-pip \ - python3 \ - sudo \ - wireless-tools \ - wpasupplicant \ - && ln -fs /usr/share/zoneinfo/UTC /etc/localtime \ - && git clone https://github.com/openthread/ot-br-posix . \ - && git checkout $OT_BR_POSIX_CHECKOUT \ - && git submodule update --init --depth=1 \ - && ./script/bootstrap \ - && ./script/setup \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - git psmisc ninja-build cmake wget libreadline-dev libncurses-dev libcpputest-dev \ - libavahi-common-dev libavahi-client-dev libboost-dev libboost-filesystem-dev \ - libboost-system-dev libjsoncpp-dev libnetfilter-queue-dev cmake cpputest doxygen \ - && mkdir -p /etc/wpa_supplicant \ - && echo "ctrl_interface=/run/wpa_supplicant" >> /etc/wpa_supplicant/wpa_supplicant.conf \ - && echo "update_config=1" >> /etc/wpa_supplicant/wpa_supplicant.conf \ - && rm -rf /var/lib/apt/lists/* \ - && pip3 install --no-cache-dir click==8.0.3 - -COPY CHIPCirqueDaemon.py /bin/CHIPCirqueDaemon.py -COPY entrypoint.sh /opt/entrypoint.sh - -WORKDIR / - -ENTRYPOINT ["/opt/entrypoint.sh"] - -EXPOSE 80 diff --git a/integrations/docker/ci-only-images/chip-cirque-device-base/build.sh b/integrations/docker/ci-only-images/chip-cirque-device-base/build.sh deleted file mode 100755 index 7c8856c3d6189d..00000000000000 --- a/integrations/docker/ci-only-images/chip-cirque-device-base/build.sh +++ /dev/null @@ -1,111 +0,0 @@ -#!/usr/bin/env bash - -# -# Copyright (c) 2020 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# build.sh - utility for building (and optionally) tagging and pushing -# the a Docker image -# -# This script expects to find a Dockerfile next to $0, so symlink -# in an image name directory is the expected use case. - -set -xe - -me=$(basename "$0") -SOURCE=${BASH_SOURCE[0]} -cd "$(dirname "$SOURCE")" - -SOURCE_DIR=$PWD - -ORG=${DOCKER_BUILD_ORG:-connectedhomeip} - -# directory name is -IMAGE=${DOCKER_BUILD_IMAGE:-$(basename "$(pwd)")} - -# version -VERSION=${DOCKER_BUILD_VERSION:-$(sed 's/ .*//' version)} - -GITHUB_ACTION_RUN=${GITHUB_ACTION_RUN:-"0"} - -REPO_DIR="$SOURCE_DIR/../../../../" - -if [[ "$GITHUB_ACTION_RUN" = "1" ]]; then - # Note: This script will be invoked in docker on CI, We should ensure CHIP repo to safe directory to silent git error messages. - git config --global --add safe.directory /home/runner/work/connectedhomeip/connectedhomeip -fi - -# The image build will clone its own ot-br-posix checkout due to limitations of git submodule. -# Using the same ot-br-posix version as chip -OT_BR_POSIX=$REPO_DIR/third_party/ot-br-posix/repo -OT_BR_POSIX_CHECKOUT=$(cd "$REPO_DIR" && git rev-parse :third_party/ot-br-posix/repo) - -# For chip-cirque-device-base image we use the checkout of ot-br-posix repo -# This is used for not pollute master branch checkout when someone pulls ot-br-posix -# If this fails, the script will still rebuild the image. -CIRQUE_CACHE_PATH=${GITHUB_CACHE_PATH:-"/tmp/cirque-cache/"} -IMAGE_SAVE_PATH="$CIRQUE_CACHE_PATH"/"$IMAGE"_"$OT_BR_POSIX_CHECKOUT".tar - -[[ ${*/--help//} != "${*}" ]] && { - set +x - echo "Usage: $me - - Build and (optionally tag as latest, push) a docker image from Dockerfile in CWD - - Options: - --no-cache passed as a docker build argument - --help get this message - -" - exit 0 -} - -die() { - echo "$me: *** ERROR: $*" - exit 1 -} - -set -ex - -[[ -n $VERSION ]] || die "version cannot be empty" - -# go find and build any CHIP images this image is "FROM" -awk -F/ '/^FROM connectedhomeip/ {print $2}' Dockerfile | while read -r dep; do - dep=${dep%:*} - (cd "../$dep" && ./build.sh "$@") -done - -BUILD_ARGS=() -if [[ ${*/--no-cache//} != "${*}" ]]; then - BUILD_ARGS+=(--no-cache) -else - if docker load -i "$IMAGE_SAVE_PATH"; then - echo "Loaded docker image from Github action cache." - BUILD_ARGS+=(--cache-from "$ORG/$IMAGE") - fi -fi - -docker build -t "$ORG/$IMAGE" -f "$SOURCE_DIR/Dockerfile" "${BUILD_ARGS[@]}" --build-arg OT_BR_POSIX_CHECKOUT="$OT_BR_POSIX_CHECKOUT" "$SOURCE_DIR" - -if [[ "$GITHUB_ACTION_RUN" = "1" ]]; then - # Save cache - mkdir -p "$CIRQUE_CACHE_PATH" - docker save -o "$IMAGE_SAVE_PATH" "$ORG/$IMAGE" - echo "Saved docker image for future run: " - ls -lh "$IMAGE_SAVE_PATH" - chmod 644 "$IMAGE_SAVE_PATH" -fi - -exit 0 diff --git a/integrations/docker/ci-only-images/chip-cirque-device-base/cachekey.sh b/integrations/docker/ci-only-images/chip-cirque-device-base/cachekey.sh deleted file mode 100755 index 4e5c754538a5f0..00000000000000 --- a/integrations/docker/ci-only-images/chip-cirque-device-base/cachekey.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -# -# Copyright (c) 2020 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# build.sh - utility for building (and optionally) tagging and pushing -# the a Docker image -# -# This script expects to output a string that can be used to identify one image. - -me=$(basename "$0") -cd "$(dirname "$0")" - -SOURCE=${BASH_SOURCE[0]} -SOURCE_DIR=$(cd "$(dirname "$SOURCE")" >/dev/null 2>&1 && pwd) -REPO_DIR="$SOURCE_DIR/../../../../" - -# The image build will clone its own ot-br-posix checkout due to limitations of git submodule. -# Using the same ot-br-posix version as chip -OT_BR_POSIX=$REPO_DIR/third_party/ot-br-posix/repo -OT_BR_POSIX_CHECKOUT=$(cd "$REPO_DIR" && git rev-parse :third_party/ot-br-posix/repo) - -filehash() { - shasum "$1" | awk '{ print $1 }' -} - -echo "ot-br-posix.$OT_BR_POSIX_CHECKOUT.dockerfile.$(filehash ./Dockerfile)" diff --git a/integrations/docker/ci-only-images/chip-cirque-device-base/entrypoint.sh b/integrations/docker/ci-only-images/chip-cirque-device-base/entrypoint.sh deleted file mode 100755 index a0235ee1e7dd81..00000000000000 --- a/integrations/docker/ci-only-images/chip-cirque-device-base/entrypoint.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -# -# Copyright (c) 2021 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -service dbus start -service avahi-daemon start -/bin/CHIPCirqueDaemon.py --server otbr-agent diff --git a/integrations/docker/ci-only-images/chip-cirque-device-base/version b/integrations/docker/ci-only-images/chip-cirque-device-base/version deleted file mode 100644 index 4add8a3f3185ce..00000000000000 --- a/integrations/docker/ci-only-images/chip-cirque-device-base/version +++ /dev/null @@ -1 +0,0 @@ -0.4.21 diff --git a/integrations/docker/images/chip-build-minimal/Dockerfile b/integrations/docker/images/base/chip-build-minimal/Dockerfile similarity index 92% rename from integrations/docker/images/chip-build-minimal/Dockerfile rename to integrations/docker/images/base/chip-build-minimal/Dockerfile index 093943d03a1d3a..f44700ad912842 100644 --- a/integrations/docker/images/chip-build-minimal/Dockerfile +++ b/integrations/docker/images/base/chip-build-minimal/Dockerfile @@ -1,5 +1,6 @@ # This minimal build image is intentionally not based on chip-build FROM ubuntu:focal +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip # ARG NINJA_VERSION=v1.11.1 ARG GN_HASH=5a004f9427a050c6c393c07ddb85cba8ff3849fa diff --git a/integrations/docker/images/base/chip-build-minimal/build.sh b/integrations/docker/images/base/chip-build-minimal/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/base/chip-build-minimal/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/base/chip-build-minimal/run.sh b/integrations/docker/images/base/chip-build-minimal/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/base/chip-build-minimal/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-ameba/version b/integrations/docker/images/base/chip-build-minimal/version similarity index 100% rename from integrations/docker/images/chip-build-ameba/version rename to integrations/docker/images/base/chip-build-minimal/version diff --git a/integrations/docker/images/chip-build/Dockerfile b/integrations/docker/images/base/chip-build/Dockerfile similarity index 98% rename from integrations/docker/images/chip-build/Dockerfile rename to integrations/docker/images/base/chip-build/Dockerfile index 643fd361228cfc..60f8cd9a1e015a 100644 --- a/integrations/docker/images/chip-build/Dockerfile +++ b/integrations/docker/images/base/chip-build/Dockerfile @@ -1,5 +1,6 @@ # start with Ubuntu 20.04LTS FROM ubuntu:focal +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip VOLUME "/var/source" diff --git a/integrations/docker/images/chip-build/README.md b/integrations/docker/images/base/chip-build/README.md similarity index 93% rename from integrations/docker/images/chip-build/README.md rename to integrations/docker/images/base/chip-build/README.md index 76260bb2567215..1da8f294c7639b 100644 --- a/integrations/docker/images/chip-build/README.md +++ b/integrations/docker/images/base/chip-build/README.md @@ -1,6 +1,6 @@ # Docker connectedhomeip:chip-build -connectedhomeip/chip-build is the name of the Docker image used by CHIP for +project-chip/chip-build is the name of the Docker image used by CHIP for continuous integration and other builds. Contents of this directory: diff --git a/integrations/docker/images/base/chip-build/build.sh b/integrations/docker/images/base/chip-build/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/base/chip-build/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/base/chip-build/run.sh b/integrations/docker/images/base/chip-build/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/base/chip-build/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version new file mode 100644 index 00000000000000..d00491fd7e5bb6 --- /dev/null +++ b/integrations/docker/images/base/chip-build/version @@ -0,0 +1 @@ +1 diff --git a/integrations/docker/images/chip-build-ameba/build.sh b/integrations/docker/images/chip-build-ameba/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-ameba/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-ameba/run.sh b/integrations/docker/images/chip-build-ameba/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-ameba/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-android/build.sh b/integrations/docker/images/chip-build-android/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-android/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-android/run.sh b/integrations/docker/images/chip-build-android/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-android/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-android/version b/integrations/docker/images/chip-build-android/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-android/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-asr/build.sh b/integrations/docker/images/chip-build-asr/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-asr/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-asr/run.sh b/integrations/docker/images/chip-build-asr/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-asr/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-asr/version b/integrations/docker/images/chip-build-asr/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-asr/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-bouffalolab/Dockerfile b/integrations/docker/images/chip-build-bouffalolab/Dockerfile deleted file mode 100644 index 61695f50adbee2..00000000000000 --- a/integrations/docker/images/chip-build-bouffalolab/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} - -RUN apt update -y \ - && apt install vim -fy \ - && apt clean \ - && pip3 install bflb-iot-tool \ - && : # last line - -COPY setup.sh /tmp - -RUN cd /tmp \ - && bash setup.sh \ - && rm setup.sh \ - && : # last line - -ENV BOUFFALOLAB_SDK_ROOT=/opt/bouffalolab_sdk diff --git a/integrations/docker/images/chip-build-bouffalolab/build.sh b/integrations/docker/images/chip-build-bouffalolab/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-bouffalolab/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-bouffalolab/run.sh b/integrations/docker/images/chip-build-bouffalolab/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-bouffalolab/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-bouffalolab/version b/integrations/docker/images/chip-build-bouffalolab/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-bouffalolab/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-cirque/Dockerfile b/integrations/docker/images/chip-build-cirque/Dockerfile deleted file mode 100644 index e6b1b8d1b023a7..00000000000000 --- a/integrations/docker/images/chip-build-cirque/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} - -# Bazel -RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -fy \ - curl gnupg \ - && curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor > bazel.gpg \ - && mv bazel.gpg /etc/apt/trusted.gpg.d/ \ - && echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -fy \ - bazel \ - && : # aids diffs - -# Docker -RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -fy \ - curl gnupg-agent apt-transport-https ca-certificates \ - software-properties-common \ - && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \ - && python3.8 `which add-apt-repository` \ - "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -fy \ - docker-ce docker-ce-cli containerd.io \ - && : # aids diffs - -# Other Cirque prereqs -RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -fy \ - sudo socat psmisc tigervnc-standalone-server xorg xauth \ - python3-pip python3-venv libdbus-glib-1-dev \ - uuid-runtime libgirepository1.0-dev \ - && : # aids diffs - -COPY requirements_nogrpc.txt /requirements.txt - -RUN set -x \ - && pip3 install -r requirements.txt \ - && xinit -- /usr/bin/Xvnc \ - && : # aids diffs diff --git a/integrations/docker/images/chip-build-cirque/README.md b/integrations/docker/images/chip-build-cirque/README.md deleted file mode 100644 index ad46899bcedd9e..00000000000000 --- a/integrations/docker/images/chip-build-cirque/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# Docker connectedhomeip:chip-build-cirque - -connectedhomeip/chip-build-cirque is the name of the Docker image used by CHIP -for continuous integration and other builds when using Cirque. It builds upon -the chip-build image and adds system dependencies needed by Cirque. - -Contents of this directory: - -- build.sh - utility for building (and optionally) tagging and pushing the - chip-build Docker image -- version - the semver-style version of the image in use for this branch of - CHIP -- Dockerfile - description of the image - -Please update version when any required tooling is updated. Some rough -guidelines: - -- Updating a tool? Increment dot version unless the tool has a major version - delta or a backward incompatibility -- Adding a tool? Increment minor version: e.g. 0.2.1 -> 0.3.0 -- Removing a tool? Increment major version: e.g. 1.2 -> 2.0 - -Note, you must have privileged access to the connectedhomeip area on Docker Hub -to push the image. - -Typical use: - -1. new build tool dependency identified -2. add tool to Dockerfile -3. update version -4. `$ ./build.sh`, which installs the image locally as the new version -5. update the image version in the devcontainer.json and CI manifests -6. verify that the build works locally in the new image -7. `$ docker login` -8. `$ ./build.sh --push --latest`, _*Note:*_ omit `--latest` unless on the - master branch diff --git a/integrations/docker/images/chip-build-cirque/build.sh b/integrations/docker/images/chip-build-cirque/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-cirque/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-cirque/requirements_nogrpc.txt b/integrations/docker/images/chip-build-cirque/requirements_nogrpc.txt deleted file mode 100644 index 508ad6d8ddef61..00000000000000 --- a/integrations/docker/images/chip-build-cirque/requirements_nogrpc.txt +++ /dev/null @@ -1,8 +0,0 @@ -cmd2 -docker >= 4.1.0 -flask == 2.2.2 -pycodestyle >= 2.5.0 -pylint == 2.4 -pyroute2 >= 0.5.7 -six >= 1.12 -toml diff --git a/integrations/docker/images/chip-build-cirque/run.sh b/integrations/docker/images/chip-build-cirque/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-cirque/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-cirque/version b/integrations/docker/images/chip-build-cirque/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-cirque/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-crosscompile/build.sh b/integrations/docker/images/chip-build-crosscompile/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-crosscompile/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-crosscompile/run.sh b/integrations/docker/images/chip-build-crosscompile/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-crosscompile/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-crosscompile/version b/integrations/docker/images/chip-build-crosscompile/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-crosscompile/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-doxygen/build.sh b/integrations/docker/images/chip-build-doxygen/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-doxygen/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-doxygen/run.sh b/integrations/docker/images/chip-build-doxygen/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-doxygen/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-doxygen/version b/integrations/docker/images/chip-build-doxygen/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-doxygen/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-efr32/build.sh b/integrations/docker/images/chip-build-efr32/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-efr32/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-efr32/run.sh b/integrations/docker/images/chip-build-efr32/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-efr32/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-efr32/version b/integrations/docker/images/chip-build-efr32/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-efr32/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-esp32-qemu/build.sh b/integrations/docker/images/chip-build-esp32-qemu/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-esp32-qemu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-esp32-qemu/run.sh b/integrations/docker/images/chip-build-esp32-qemu/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-esp32-qemu/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-esp32-qemu/version b/integrations/docker/images/chip-build-esp32-qemu/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-esp32-qemu/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-esp32/build.sh b/integrations/docker/images/chip-build-esp32/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-esp32/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-esp32/run.sh b/integrations/docker/images/chip-build-esp32/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-esp32/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-esp32/version b/integrations/docker/images/chip-build-esp32/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-esp32/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-imx/build.sh b/integrations/docker/images/chip-build-imx/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-imx/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-imx/run.sh b/integrations/docker/images/chip-build-imx/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-imx/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-imx/version b/integrations/docker/images/chip-build-imx/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-imx/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-infineon/build.sh b/integrations/docker/images/chip-build-infineon/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-infineon/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-infineon/run.sh b/integrations/docker/images/chip-build-infineon/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-infineon/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-infineon/version b/integrations/docker/images/chip-build-infineon/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-infineon/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-java/build.sh b/integrations/docker/images/chip-build-java/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-java/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-java/run.sh b/integrations/docker/images/chip-build-java/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-java/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-java/version b/integrations/docker/images/chip-build-java/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-java/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-k32w/build.sh b/integrations/docker/images/chip-build-k32w/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-k32w/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-k32w/run.sh b/integrations/docker/images/chip-build-k32w/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-k32w/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-k32w/version b/integrations/docker/images/chip-build-k32w/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-k32w/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-mbed-os/build.sh b/integrations/docker/images/chip-build-mbed-os/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-mbed-os/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-mbed-os/run.sh b/integrations/docker/images/chip-build-mbed-os/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-mbed-os/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-mbed-os/version b/integrations/docker/images/chip-build-mbed-os/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-mbed-os/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-minimal/build.sh b/integrations/docker/images/chip-build-minimal/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-minimal/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-minimal/run.sh b/integrations/docker/images/chip-build-minimal/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-minimal/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-minimal/version b/integrations/docker/images/chip-build-minimal/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-minimal/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-nrf-platform/build.sh b/integrations/docker/images/chip-build-nrf-platform/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-nrf-platform/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-nrf-platform/run.sh b/integrations/docker/images/chip-build-nrf-platform/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-nrf-platform/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-nrf-platform/version b/integrations/docker/images/chip-build-nrf-platform/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-nrf-platform/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-openiotsdk/build.sh b/integrations/docker/images/chip-build-openiotsdk/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-openiotsdk/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-openiotsdk/run.sh b/integrations/docker/images/chip-build-openiotsdk/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-openiotsdk/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-openiotsdk/version b/integrations/docker/images/chip-build-openiotsdk/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-openiotsdk/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-telink/build.sh b/integrations/docker/images/chip-build-telink/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-telink/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-telink/run.sh b/integrations/docker/images/chip-build-telink/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-telink/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-telink/version b/integrations/docker/images/chip-build-telink/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-telink/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-ti/build.sh b/integrations/docker/images/chip-build-ti/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-ti/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-ti/run.sh b/integrations/docker/images/chip-build-ti/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-ti/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-ti/version b/integrations/docker/images/chip-build-ti/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-ti/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-tizen-qemu/build.sh b/integrations/docker/images/chip-build-tizen-qemu/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-tizen-qemu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-tizen-qemu/run.sh b/integrations/docker/images/chip-build-tizen-qemu/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-tizen-qemu/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-tizen-qemu/version b/integrations/docker/images/chip-build-tizen-qemu/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-tizen-qemu/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-tizen/build.sh b/integrations/docker/images/chip-build-tizen/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-tizen/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-tizen/run.sh b/integrations/docker/images/chip-build-tizen/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-tizen/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-tizen/version b/integrations/docker/images/chip-build-tizen/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-tizen/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-vscode/build.sh b/integrations/docker/images/chip-build-vscode/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build-vscode/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-vscode/run.sh b/integrations/docker/images/chip-build-vscode/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build-vscode/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-vscode/version b/integrations/docker/images/chip-build-vscode/version deleted file mode 120000 index a4280acd348e7f..00000000000000 --- a/integrations/docker/images/chip-build-vscode/version +++ /dev/null @@ -1 +0,0 @@ -../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build/build.sh b/integrations/docker/images/chip-build/build.sh deleted file mode 120000 index fcb4d4ee75d531..00000000000000 --- a/integrations/docker/images/chip-build/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build/run.sh b/integrations/docker/images/chip-build/run.sh deleted file mode 120000 index ccbd3501b330d9..00000000000000 --- a/integrations/docker/images/chip-build/run.sh +++ /dev/null @@ -1 +0,0 @@ -../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version deleted file mode 100644 index 5cbd46145c3df6..00000000000000 --- a/integrations/docker/images/chip-build/version +++ /dev/null @@ -1 +0,0 @@ -0.7.25 Version bump reason: Update silabs GSDK version diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile index 31ea9711475967..9046a2cb346fea 100644 --- a/integrations/docker/images/chip-cert-bins/Dockerfile +++ b/integrations/docker/images/chip-cert-bins/Dockerfile @@ -1,5 +1,6 @@ # Stage 1: Setup dependencies (based on chip-build). FROM ubuntu:22.04 as chip-build-cert +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip ARG TARGETPLATFORM # COMMITHASH defines the target commit to build from. May be passed in using --build-arg. ARG COMMITHASH=7b99e6399c6069037c613782d78132c69b9dcabb @@ -11,22 +12,22 @@ ARG ZAP_VERSION=v2023.05.22-nightly # Ensure TARGETPLATFORM is set RUN case ${TARGETPLATFORM} in \ - "linux/amd64") \ - echo "Building for linux/amd64" \ - ;; \ - "linux/arm64") \ - echo "Building for linux/arm64" \ - ;; \ - *) \ - if [ -z "$TARGETPLATFORM" ] ;\ - then \ - echo "TARGETPLATFORM not defined! Please run from buildkit (buildx)." \ - && return 1 ;\ - else \ - echo "Unsupported platform ${TARGETPLATFORM}." \ - && return 1 ;\ - fi \ - ;; \ + "linux/amd64") \ + echo "Building for linux/amd64" \ + ;; \ + "linux/arm64") \ + echo "Building for linux/arm64" \ + ;; \ + *) \ + if [ -z "$TARGETPLATFORM" ] ;\ + then \ + echo "TARGETPLATFORM not defined! Please run from buildkit (buildx)." \ + && return 1 ;\ + else \ + echo "Unsupported platform ${TARGETPLATFORM}." \ + && return 1 ;\ + fi \ + ;; \ esac # Below should be the same as chip-build except arm64 logic for cmake and node. @@ -96,25 +97,25 @@ RUN set -x \ # Cmake (Mbed OS requires >=3.19.0-rc3 version which is not available in Ubuntu 20.04 repository) RUN case ${TARGETPLATFORM} in \ - "linux/amd64") \ - set -x \ - && (cd /tmp \ - && wget --progress=dot:giga https://github.com/Kitware/CMake/releases/download/v3.19.3/cmake-3.19.3-Linux-x86_64.sh \ - && sh cmake-3.19.3-Linux-x86_64.sh --exclude-subdir --prefix=/usr/local \ - && rm -rf cmake-3.19.3-Linux-x86_64.sh) \ - && exec bash \ - ;; \ - "linux/arm64") \ - set -x \ - && (cd /tmp \ - && wget --progress=dot:giga https://github.com/Kitware/CMake/releases/download/v3.19.3/cmake-3.19.3-Linux-aarch64.sh \ - && sh cmake-3.19.3-Linux-aarch64.sh --exclude-subdir --prefix=/usr/local \ - && rm -rf cmake-3.19.3-Linux-aarch64.sh) \ - && exec bash \ - ;; \ - *) \ - test -n "$TARGETPLATFORM" \ - echo "Unsupported platform ${TARGETPLATFORM}" \ + "linux/amd64") \ + set -x \ + && (cd /tmp \ + && wget --progress=dot:giga https://github.com/Kitware/CMake/releases/download/v3.19.3/cmake-3.19.3-Linux-x86_64.sh \ + && sh cmake-3.19.3-Linux-x86_64.sh --exclude-subdir --prefix=/usr/local \ + && rm -rf cmake-3.19.3-Linux-x86_64.sh) \ + && exec bash \ + ;; \ + "linux/arm64") \ + set -x \ + && (cd /tmp \ + && wget --progress=dot:giga https://github.com/Kitware/CMake/releases/download/v3.19.3/cmake-3.19.3-Linux-aarch64.sh \ + && sh cmake-3.19.3-Linux-aarch64.sh --exclude-subdir --prefix=/usr/local \ + && rm -rf cmake-3.19.3-Linux-aarch64.sh) \ + && exec bash \ + ;; \ + *) \ + test -n "$TARGETPLATFORM" \ + echo "Unsupported platform ${TARGETPLATFORM}" \ ;; \ esac @@ -159,31 +160,31 @@ RUN set -x \ # NodeJS: install a newer version than what apt-get would read # This installs the latest LTS version of nodejs RUN case ${TARGETPLATFORM} in \ - "linux/amd64") \ - set -x \ - && mkdir node_js \ - && cd node_js \ - && wget https://nodejs.org/dist/v12.22.12/node-v12.22.12-linux-x64.tar.xz \ - && tar xfvJ node-v12.22.12-linux-x64.tar.xz \ - && mv node-v12.22.12-linux-x64 /opt/ \ - && ln -s /opt/node-v12.22.12-linux-x64 /opt/node \ - && ln -s /opt/node/bin/* /usr/bin \ - && cd .. \ - && rm -rf node_js \ - ;; \ - "linux/arm64")\ - set -x \ - && mkdir node_js \ - && cd node_js \ - && wget https://nodejs.org/dist/v12.22.12/node-v12.22.12-linux-arm64.tar.xz \ - && tar xfvJ node-v12.22.12-linux-arm64.tar.xz \ - && mv node-v12.22.12-linux-arm64 /opt/ \ - && ln -s /opt/node-v12.22.12-linux-arm64 /opt/node \ - && ln -s /opt/node/bin/* /usr/bin \ - && cd .. \ - && rm -rf node_js \ - ;; \ - *) ;; \ + "linux/amd64") \ + set -x \ + && mkdir node_js \ + && cd node_js \ + && wget https://nodejs.org/dist/v12.22.12/node-v12.22.12-linux-x64.tar.xz \ + && tar xfvJ node-v12.22.12-linux-x64.tar.xz \ + && mv node-v12.22.12-linux-x64 /opt/ \ + && ln -s /opt/node-v12.22.12-linux-x64 /opt/node \ + && ln -s /opt/node/bin/* /usr/bin \ + && cd .. \ + && rm -rf node_js \ + ;; \ + "linux/arm64")\ + set -x \ + && mkdir node_js \ + && cd node_js \ + && wget https://nodejs.org/dist/v12.22.12/node-v12.22.12-linux-arm64.tar.xz \ + && tar xfvJ node-v12.22.12-linux-arm64.tar.xz \ + && mv node-v12.22.12-linux-arm64 /opt/ \ + && ln -s /opt/node-v12.22.12-linux-arm64 /opt/node \ + && ln -s /opt/node/bin/* /usr/bin \ + && cd .. \ + && rm -rf node_js \ + ;; \ + *) ;; \ esac RUN set -x \ @@ -217,63 +218,63 @@ SHELL ["/bin/bash", "-c"] RUN git rev-parse HEAD > /root/.sdk-sha-version RUN case ${TARGETPLATFORM} in \ - "linux/amd64") \ - set -x \ - && source scripts/activate.sh \ - && scripts/build/build_examples.py \ - --target linux-x64-all-clusters-ipv6only \ - --target linux-x64-all-clusters-minimal-ipv6only \ - --target linux-x64-bridge-ipv6only \ - --target linux-x64-tv-app-ipv6only \ - --target linux-x64-tv-casting-app-ipv6only \ - --target linux-x64-light-ipv6only \ - --target linux-x64-thermostat-ipv6only \ - --target linux-x64-ota-provider-ipv6only \ - --target linux-x64-ota-requestor-ipv6only \ - --target linux-x64-lock-ipv6only \ - --target linux-x64-simulated-app1-ipv6only \ - build \ - && mv out/linux-x64-all-clusters-ipv6only/chip-all-clusters-app out/chip-all-clusters-app \ - && mv out/linux-x64-all-clusters-minimal-ipv6only/chip-all-clusters-minimal-app out/chip-all-clusters-minimal-app \ - && mv out/linux-x64-bridge-ipv6only/chip-bridge-app out/chip-bridge-app \ - && mv out/linux-x64-tv-app-ipv6only/chip-tv-app out/chip-tv-app \ - && mv out/linux-x64-tv-casting-app-ipv6only/chip-tv-casting-app out/chip-tv-casting-app \ - && mv out/linux-x64-light-ipv6only/chip-lighting-app out/chip-lighting-app \ - && mv out/linux-x64-thermostat-ipv6only/thermostat-app out/thermostat-app \ - && mv out/linux-x64-ota-provider-ipv6only/chip-ota-provider-app out/chip-ota-provider-app \ - && mv out/linux-x64-ota-requestor-ipv6only/chip-ota-requestor-app out/chip-ota-requestor-app \ - && mv out/linux-x64-lock-ipv6only/chip-lock-app out/chip-lock-app \ - && mv out/linux-x64-simulated-app1-ipv6only/chip-app1 out/chip-app1 \ - ;; \ - "linux/arm64")\ - set -x \ - && source scripts/activate.sh \ - && scripts/build/build_examples.py \ - --target linux-arm64-all-clusters-ipv6only \ - --target linux-arm64-all-clusters-minimal-ipv6only \ - --target linux-arm64-bridge-ipv6only \ - --target linux-arm64-tv-app-ipv6only \ - --target linux-arm64-tv-casting-app-ipv6only \ - --target linux-arm64-light-ipv6only \ - --target linux-arm64-thermostat-ipv6only \ - --target linux-arm64-ota-provider-ipv6only \ - --target linux-arm64-ota-requestor-ipv6only \ - --target linux-arm64-lock-ipv6only \ - --target linux-arm64-simulated-app1-ipv6only \ - build \ - && mv out/linux-arm64-all-clusters-ipv6only/chip-all-clusters-app out/chip-all-clusters-app \ - && mv out/linux-arm64-all-clusters-minimal-ipv6only/chip-all-clusters-minimal-app out/chip-all-clusters-minimal-app \ - && mv out/linux-arm64-bridge-ipv6only/chip-bridge-app out/chip-bridge-app \ - && mv out/linux-arm64-tv-app-ipv6only/chip-tv-app out/chip-tv-app \ - && mv out/linux-arm64-tv-casting-app-ipv6only/chip-tv-casting-app out/chip-tv-casting-app \ - && mv out/linux-arm64-light-ipv6only/chip-lighting-app out/chip-lighting-app \ - && mv out/linux-arm64-thermostat-ipv6only/thermostat-app out/thermostat-app \ - && mv out/linux-arm64-ota-provider-ipv6only/chip-ota-provider-app out/chip-ota-provider-app \ - && mv out/linux-arm64-ota-requestor-ipv6only/chip-ota-requestor-app out/chip-ota-requestor-app \ - && mv out/linux-arm64-lock-ipv6only/chip-lock-app out/chip-lock-app \ - && mv out/linux-arm64-simulated-app1-ipv6only/chip-app1 out/chip-app1 \ - ;; \ - *) ;; \ + "linux/amd64") \ + set -x \ + && source scripts/activate.sh \ + && scripts/build/build_examples.py \ + --target linux-x64-all-clusters-ipv6only \ + --target linux-x64-all-clusters-minimal-ipv6only \ + --target linux-x64-bridge-ipv6only \ + --target linux-x64-tv-app-ipv6only \ + --target linux-x64-tv-casting-app-ipv6only \ + --target linux-x64-light-ipv6only \ + --target linux-x64-thermostat-ipv6only \ + --target linux-x64-ota-provider-ipv6only \ + --target linux-x64-ota-requestor-ipv6only \ + --target linux-x64-lock-ipv6only \ + --target linux-x64-simulated-app1-ipv6only \ + build \ + && mv out/linux-x64-all-clusters-ipv6only/chip-all-clusters-app out/chip-all-clusters-app \ + && mv out/linux-x64-all-clusters-minimal-ipv6only/chip-all-clusters-minimal-app out/chip-all-clusters-minimal-app \ + && mv out/linux-x64-bridge-ipv6only/chip-bridge-app out/chip-bridge-app \ + && mv out/linux-x64-tv-app-ipv6only/chip-tv-app out/chip-tv-app \ + && mv out/linux-x64-tv-casting-app-ipv6only/chip-tv-casting-app out/chip-tv-casting-app \ + && mv out/linux-x64-light-ipv6only/chip-lighting-app out/chip-lighting-app \ + && mv out/linux-x64-thermostat-ipv6only/thermostat-app out/thermostat-app \ + && mv out/linux-x64-ota-provider-ipv6only/chip-ota-provider-app out/chip-ota-provider-app \ + && mv out/linux-x64-ota-requestor-ipv6only/chip-ota-requestor-app out/chip-ota-requestor-app \ + && mv out/linux-x64-lock-ipv6only/chip-lock-app out/chip-lock-app \ + && mv out/linux-x64-simulated-app1-ipv6only/chip-app1 out/chip-app1 \ + ;; \ + "linux/arm64")\ + set -x \ + && source scripts/activate.sh \ + && scripts/build/build_examples.py \ + --target linux-arm64-all-clusters-ipv6only \ + --target linux-arm64-all-clusters-minimal-ipv6only \ + --target linux-arm64-bridge-ipv6only \ + --target linux-arm64-tv-app-ipv6only \ + --target linux-arm64-tv-casting-app-ipv6only \ + --target linux-arm64-light-ipv6only \ + --target linux-arm64-thermostat-ipv6only \ + --target linux-arm64-ota-provider-ipv6only \ + --target linux-arm64-ota-requestor-ipv6only \ + --target linux-arm64-lock-ipv6only \ + --target linux-arm64-simulated-app1-ipv6only \ + build \ + && mv out/linux-arm64-all-clusters-ipv6only/chip-all-clusters-app out/chip-all-clusters-app \ + && mv out/linux-arm64-all-clusters-minimal-ipv6only/chip-all-clusters-minimal-app out/chip-all-clusters-minimal-app \ + && mv out/linux-arm64-bridge-ipv6only/chip-bridge-app out/chip-bridge-app \ + && mv out/linux-arm64-tv-app-ipv6only/chip-tv-app out/chip-tv-app \ + && mv out/linux-arm64-tv-casting-app-ipv6only/chip-tv-casting-app out/chip-tv-casting-app \ + && mv out/linux-arm64-light-ipv6only/chip-lighting-app out/chip-lighting-app \ + && mv out/linux-arm64-thermostat-ipv6only/thermostat-app out/thermostat-app \ + && mv out/linux-arm64-ota-provider-ipv6only/chip-ota-provider-app out/chip-ota-provider-app \ + && mv out/linux-arm64-ota-requestor-ipv6only/chip-ota-requestor-app out/chip-ota-requestor-app \ + && mv out/linux-arm64-lock-ipv6only/chip-lock-app out/chip-lock-app \ + && mv out/linux-arm64-simulated-app1-ipv6only/chip-app1 out/chip-app1 \ + ;; \ + *) ;; \ esac RUN source scripts/activate.sh && scripts/build_python.sh -m platform -d true -i no diff --git a/integrations/docker/images/chip-build-crosscompile/.gitignore b/integrations/docker/images/stage-1/chip-build-crosscompile/.gitignore similarity index 100% rename from integrations/docker/images/chip-build-crosscompile/.gitignore rename to integrations/docker/images/stage-1/chip-build-crosscompile/.gitignore diff --git a/integrations/docker/images/chip-build-crosscompile/Dockerfile b/integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile similarity index 83% rename from integrations/docker/images/chip-build-crosscompile/Dockerfile rename to integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile index 0dfb3328b79798..64636dd42c5d64 100644 --- a/integrations/docker/images/chip-build-crosscompile/Dockerfile +++ b/integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} as build +FROM ghcr.io/project-chip/chip-build:${VERSION} as build +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip RUN set -x \ && apt-get update \ @@ -26,7 +27,8 @@ RUN set -x \ && rm -rf /opt/ubuntu-22.04.1-aarch64-sysroot/lib/modules \ && : # last line -FROM connectedhomeip/chip-build:${VERSION} +FROM ghcr.io/project-chip/chip-build:${VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip COPY --from=build /opt/ubuntu-22.04.1-aarch64-sysroot/ /opt/ubuntu-22.04.1-aarch64-sysroot/ diff --git a/integrations/docker/images/chip-build-crosscompile/README.md b/integrations/docker/images/stage-1/chip-build-crosscompile/README.md similarity index 100% rename from integrations/docker/images/chip-build-crosscompile/README.md rename to integrations/docker/images/stage-1/chip-build-crosscompile/README.md diff --git a/integrations/docker/images/stage-1/chip-build-crosscompile/build.sh b/integrations/docker/images/stage-1/chip-build-crosscompile/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-1/chip-build-crosscompile/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-1/chip-build-crosscompile/run.sh b/integrations/docker/images/stage-1/chip-build-crosscompile/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-1/chip-build-crosscompile/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-1/chip-build-crosscompile/version b/integrations/docker/images/stage-1/chip-build-crosscompile/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-1/chip-build-crosscompile/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-ameba/Dockerfile b/integrations/docker/images/stage-2/chip-build-ameba/Dockerfile similarity index 85% rename from integrations/docker/images/chip-build-ameba/Dockerfile rename to integrations/docker/images/stage-2/chip-build-ameba/Dockerfile index 931fd984911c37..db3ae1ca842ebe 100644 --- a/integrations/docker/images/chip-build-ameba/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-ameba/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} +FROM ghcr.io/project-chip/chip-build:${VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip # Setup Ameba ARG AMEBA_DIR=/opt/ameba diff --git a/integrations/docker/images/stage-2/chip-build-ameba/build.sh b/integrations/docker/images/stage-2/chip-build-ameba/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-ameba/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-ameba/run.sh b/integrations/docker/images/stage-2/chip-build-ameba/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-ameba/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-ameba/version b/integrations/docker/images/stage-2/chip-build-ameba/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-ameba/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-asr/Dockerfile b/integrations/docker/images/stage-2/chip-build-asr/Dockerfile similarity index 85% rename from integrations/docker/images/chip-build-asr/Dockerfile rename to integrations/docker/images/stage-2/chip-build-asr/Dockerfile index 49ddaad6332789..c00b97a6763b95 100644 --- a/integrations/docker/images/chip-build-asr/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-asr/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} +FROM ghcr.io/project-chip/chip-build:${VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip RUN set -x \ && apt-get update \ diff --git a/integrations/docker/images/stage-2/chip-build-asr/build.sh b/integrations/docker/images/stage-2/chip-build-asr/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-asr/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-asr/run.sh b/integrations/docker/images/stage-2/chip-build-asr/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-asr/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-asr/version b/integrations/docker/images/stage-2/chip-build-asr/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-asr/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-bouffalolab/Dockerfile b/integrations/docker/images/stage-2/chip-build-bouffalolab/Dockerfile new file mode 100644 index 00000000000000..3a90bd9b00be43 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-bouffalolab/Dockerfile @@ -0,0 +1,18 @@ +ARG VERSION=latest +FROM ghcr.io/project-chip/chip-build:${VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip + +RUN apt update -y \ + && apt install vim -fy \ + && apt clean \ + && pip3 install bflb-iot-tool \ + && : # last line + +COPY setup.sh /tmp + +RUN cd /tmp \ + && bash setup.sh \ + && rm setup.sh \ + && : # last line + +ENV BOUFFALOLAB_SDK_ROOT=/opt/bouffalolab_sdk diff --git a/integrations/docker/images/stage-2/chip-build-bouffalolab/build.sh b/integrations/docker/images/stage-2/chip-build-bouffalolab/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-bouffalolab/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-bouffalolab/run.sh b/integrations/docker/images/stage-2/chip-build-bouffalolab/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-bouffalolab/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-bouffalolab/setup.sh b/integrations/docker/images/stage-2/chip-build-bouffalolab/setup.sh similarity index 100% rename from integrations/docker/images/chip-build-bouffalolab/setup.sh rename to integrations/docker/images/stage-2/chip-build-bouffalolab/setup.sh diff --git a/integrations/docker/images/stage-2/chip-build-bouffalolab/version b/integrations/docker/images/stage-2/chip-build-bouffalolab/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-bouffalolab/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-doxygen/Dockerfile b/integrations/docker/images/stage-2/chip-build-doxygen/Dockerfile similarity index 56% rename from integrations/docker/images/chip-build-doxygen/Dockerfile rename to integrations/docker/images/stage-2/chip-build-doxygen/Dockerfile index f9bff774d696b5..82ea47419e792b 100644 --- a/integrations/docker/images/chip-build-doxygen/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-doxygen/Dockerfile @@ -1,4 +1,5 @@ FROM alpine:3.15 +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip RUN apk --no-cache add \ doxygen=1.9.2-r1 \ diff --git a/integrations/docker/images/stage-2/chip-build-doxygen/build.sh b/integrations/docker/images/stage-2/chip-build-doxygen/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-doxygen/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-doxygen/run.sh b/integrations/docker/images/stage-2/chip-build-doxygen/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-doxygen/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-doxygen/version b/integrations/docker/images/stage-2/chip-build-doxygen/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-doxygen/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-efr32/Dockerfile b/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile similarity index 83% rename from integrations/docker/images/chip-build-efr32/Dockerfile rename to integrations/docker/images/stage-2/chip-build-efr32/Dockerfile index 3f55636e0e1b6a..6769daef681402 100644 --- a/integrations/docker/images/chip-build-efr32/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} +FROM ghcr.io/project-chip/chip-build:${VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip # GNU ARM Embedded toolchain, cross compiler for various platform builds RUN set -x \ @@ -17,7 +18,10 @@ RUN set -x \ #Clone Gecko SDK 4.2.0 (ef05eb6) -RUN git clone --depth=1 --branch=v4.2.3 https://github.com/SiliconLabs/gecko_sdk.git +RUN git clone --depth=1 --branch=v4.2.3 https://github.com/SiliconLabs/gecko_sdk.git && \ + cd gecko_sdk && \ + rm -rf .git \ + && : # last line ENV GSDK_ROOT=/gecko_sdk/ diff --git a/integrations/docker/images/stage-2/chip-build-efr32/build.sh b/integrations/docker/images/stage-2/chip-build-efr32/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-efr32/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-efr32/run.sh b/integrations/docker/images/stage-2/chip-build-efr32/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-efr32/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-efr32/version b/integrations/docker/images/stage-2/chip-build-efr32/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-efr32/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-esp32/Dockerfile b/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile similarity index 76% rename from integrations/docker/images/chip-build-esp32/Dockerfile rename to integrations/docker/images/stage-2/chip-build-esp32/Dockerfile index 0a512b4a2895d9..7f7b8a9c7da83b 100644 --- a/integrations/docker/images/chip-build-esp32/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} as build +FROM ghcr.io/project-chip/chip-build:${VERSION} as build +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip RUN set -x \ && apt-get update \ @@ -13,7 +14,7 @@ RUN set -x \ && git clone --recursive -b v4.4.4 --depth 1 --shallow-submodule https://github.com/espressif/esp-idf.git /tmp/esp-idf \ && : # last line -FROM connectedhomeip/chip-build:${VERSION} +FROM ghcr.io/project-chip/chip-build:${VERSION} ENV IDF_PATH=/opt/espressif/esp-idf/ ENV IDF_TOOLS_PATH=/opt/espressif/tools diff --git a/integrations/docker/images/stage-2/chip-build-esp32/build.sh b/integrations/docker/images/stage-2/chip-build-esp32/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-esp32/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-esp32/run.sh b/integrations/docker/images/stage-2/chip-build-esp32/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-esp32/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-esp32/version b/integrations/docker/images/stage-2/chip-build-esp32/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-esp32/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-imx/Dockerfile b/integrations/docker/images/stage-2/chip-build-imx/Dockerfile similarity index 81% rename from integrations/docker/images/chip-build-imx/Dockerfile rename to integrations/docker/images/stage-2/chip-build-imx/Dockerfile index f5defda3618820..35ab85f986cda1 100644 --- a/integrations/docker/images/chip-build-imx/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-imx/Dockerfile @@ -1,5 +1,7 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} as build +FROM ghcr.io/project-chip/chip-build:${VERSION} as build +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip + RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ @@ -20,7 +22,7 @@ RUN set -x \ && find . -iname ".debug" -exec rm -rf "{}" + || true \ && : # last line -FROM connectedhomeip/chip-build:${VERSION} +FROM ghcr.io/project-chip/chip-build:${VERSION} COPY --from=build /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland diff --git a/integrations/docker/images/stage-2/chip-build-imx/build.sh b/integrations/docker/images/stage-2/chip-build-imx/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-imx/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-imx/run.sh b/integrations/docker/images/stage-2/chip-build-imx/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-imx/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-imx/version b/integrations/docker/images/stage-2/chip-build-imx/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-imx/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-infineon/Dockerfile b/integrations/docker/images/stage-2/chip-build-infineon/Dockerfile similarity index 74% rename from integrations/docker/images/chip-build-infineon/Dockerfile rename to integrations/docker/images/stage-2/chip-build-infineon/Dockerfile index 5df88c43b7eeea..9b2ef70394bf52 100644 --- a/integrations/docker/images/chip-build-infineon/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-infineon/Dockerfile @@ -1,17 +1,18 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} +FROM ghcr.io/project-chip/chip-build:${VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip # ------------------------------------------------------------------------------ # Install prerequisites RUN apt update -y \ - && apt install -y curl git make file libglib2.0-0 libusb-1.0-0 libncurses5 sudo \ - && apt clean + && apt install -y curl git make file libglib2.0-0 libusb-1.0-0 libncurses5 sudo \ + && apt clean # ------------------------------------------------------------------------------ # Download and extract ModusToolbox 2.3 RUN curl --fail --location --silent --show-error https://itoolspriv.infineon.com/itbhs/api/packages/com.ifx.tb.tool.modustoolbox/Versions/2.4.0.5972-public/artifacts/ModusToolbox_2.4.0.5972-linux-install.tar.gz/download?noredirect -o /tmp/ModusToolbox_2.4.0.5972-linux-install.tar.gz \ - && tar -C /opt -zxf /tmp/ModusToolbox_2.4.0.5972-linux-install.tar.gz \ - && rm /tmp/ModusToolbox_2.4.0.5972-linux-install.tar.gz + && tar -C /opt -zxf /tmp/ModusToolbox_2.4.0.5972-linux-install.tar.gz \ + && rm /tmp/ModusToolbox_2.4.0.5972-linux-install.tar.gz # ------------------------------------------------------------------------------ # Execute post-build scripts diff --git a/integrations/docker/images/stage-2/chip-build-infineon/build.sh b/integrations/docker/images/stage-2/chip-build-infineon/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-infineon/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-infineon/run.sh b/integrations/docker/images/stage-2/chip-build-infineon/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-infineon/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-infineon/version b/integrations/docker/images/stage-2/chip-build-infineon/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-infineon/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-java/Dockerfile b/integrations/docker/images/stage-2/chip-build-java/Dockerfile similarity index 75% rename from integrations/docker/images/chip-build-java/Dockerfile rename to integrations/docker/images/stage-2/chip-build-java/Dockerfile index a55801e0ac1d6b..e0958294e5ed8e 100644 --- a/integrations/docker/images/chip-build-java/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-java/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} +FROM ghcr.io/project-chip/chip-build:${VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip # Download and install kotlin compiler RUN set -x \ diff --git a/integrations/docker/images/stage-2/chip-build-java/build.sh b/integrations/docker/images/stage-2/chip-build-java/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-java/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-java/run.sh b/integrations/docker/images/stage-2/chip-build-java/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-java/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-java/version b/integrations/docker/images/stage-2/chip-build-java/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-java/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-k32w/Dockerfile b/integrations/docker/images/stage-2/chip-build-k32w/Dockerfile similarity index 73% rename from integrations/docker/images/chip-build-k32w/Dockerfile rename to integrations/docker/images/stage-2/chip-build-k32w/Dockerfile index 41e779c8fdd613..bef2b594d6b519 100644 --- a/integrations/docker/images/chip-build-k32w/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-k32w/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} as build +FROM ghcr.io/project-chip/chip-build:${VERSION} as build +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip RUN set -x \ && apt-get update \ @@ -17,7 +18,7 @@ RUN set -x \ && rm -rf SDK_2_6_11_K32W061DK6.zip \ && : # last line -FROM connectedhomeip/chip-build:${VERSION} +FROM ghcr.io/project-chip/chip-build:${VERSION} COPY --from=build /opt/sdk/ /opt/sdk/ diff --git a/integrations/docker/images/stage-2/chip-build-k32w/build.sh b/integrations/docker/images/stage-2/chip-build-k32w/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-k32w/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-k32w/run.sh b/integrations/docker/images/stage-2/chip-build-k32w/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-k32w/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-k32w/version b/integrations/docker/images/stage-2/chip-build-k32w/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-k32w/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-mbed-os/Dockerfile b/integrations/docker/images/stage-2/chip-build-mbed-os/Dockerfile similarity index 66% rename from integrations/docker/images/chip-build-mbed-os/Dockerfile rename to integrations/docker/images/stage-2/chip-build-mbed-os/Dockerfile index 459bca5d6bdf38..ea574b0094b216 100644 --- a/integrations/docker/images/chip-build-mbed-os/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-mbed-os/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} as build +FROM ghcr.io/project-chip/chip-build:${VERSION} as build +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip RUN set -x \ && apt-get update \ @@ -11,15 +12,15 @@ RUN set -x \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # ------------------------------------------------------------------------------ -# Install openocd -RUN set -x \ - && mkdir -p /opt/openocd \ - && wget -O - --progress=dot:giga https://github.com/cypresssemiconductorco/openocd/releases/download/release-v4.2.0/openocd-4.2.0.1430-linux.tar.gz | tar --strip-components=1 -xz -C /opt/openocd \ - && : # last line +# # Install openocd +# RUN set -x \ +# && mkdir -p /opt/openocd \ +# && wget -O - --progress=dot:giga https://github.com/cypresssemiconductorco/openocd/releases/download/release-v4.2.0/openocd-4.2.0.1430-linux.tar.gz | tar --strip-components=1 -xz -C /opt/openocd \ +# && : # last line -FROM connectedhomeip/chip-build:${VERSION} +# FROM ghcr.io/project-chip/chip-build:${VERSION} -COPY --from=build /opt/openocd/ /opt/openocd/ +# COPY --from=build /opt/openocd/ /opt/openocd/ # ------------------------------------------------------------------------------ # Install Python modules diff --git a/integrations/docker/images/stage-2/chip-build-mbed-os/build.sh b/integrations/docker/images/stage-2/chip-build-mbed-os/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-mbed-os/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-mbed-os/run.sh b/integrations/docker/images/stage-2/chip-build-mbed-os/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-mbed-os/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-mbed-os/version b/integrations/docker/images/stage-2/chip-build-mbed-os/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-mbed-os/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-nrf-platform/Dockerfile b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile similarity index 94% rename from integrations/docker/images/chip-build-nrf-platform/Dockerfile rename to integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile index 7da1614c5bea04..518e722e72d62d 100644 --- a/integrations/docker/images/chip-build-nrf-platform/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile @@ -4,7 +4,8 @@ ARG VERSION=latest # Temporary image for SDK and dependencies download # ================================================== -FROM connectedhomeip/chip-build:${VERSION} as build +FROM ghcr.io/project-chip/chip-build:${VERSION} as build +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip # Compatible Nordic Connect SDK revision. ARG NCS_REVISION=v2.4.0 @@ -33,7 +34,7 @@ RUN set -x \ # nRF Connect SDK final image # ================================================== -FROM connectedhomeip/chip-build:${VERSION} +FROM ghcr.io/project-chip/chip-build:${VERSION} # Tools for building, flashing and accessing device logs RUN set -x \ diff --git a/integrations/docker/images/stage-2/chip-build-nrf-platform/build.sh b/integrations/docker/images/stage-2/chip-build-nrf-platform/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-nrf-platform/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-nrf-platform/run.sh b/integrations/docker/images/stage-2/chip-build-nrf-platform/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-nrf-platform/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-nrf-platform/version b/integrations/docker/images/stage-2/chip-build-nrf-platform/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-nrf-platform/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-openiotsdk/Dockerfile b/integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile similarity index 83% rename from integrations/docker/images/chip-build-openiotsdk/Dockerfile rename to integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile index 2759f7e34c20e2..47e35df21c32df 100644 --- a/integrations/docker/images/chip-build-openiotsdk/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} as build +FROM ghcr.io/project-chip/chip-build:${VERSION} as build +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip RUN set -x \ && apt-get update \ @@ -20,7 +21,8 @@ RUN set -x \ && rm -r FVP_Corstone_SSE-300_11.16_26.tgz FVP_Corstone_SSE-300.sh license_terms \ && : # last line -FROM connectedhomeip/chip-build:${VERSION} +FROM ghcr.io/project-chip/chip-build:${VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip COPY --from=build /opt/FVP_Corstone_SSE-300/ /opt/FVP_Corstone_SSE-300/ diff --git a/integrations/docker/images/stage-2/chip-build-openiotsdk/build.sh b/integrations/docker/images/stage-2/chip-build-openiotsdk/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-openiotsdk/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-openiotsdk/run.sh b/integrations/docker/images/stage-2/chip-build-openiotsdk/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-openiotsdk/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-openiotsdk/version b/integrations/docker/images/stage-2/chip-build-openiotsdk/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-openiotsdk/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile similarity index 91% rename from integrations/docker/images/chip-build-telink/Dockerfile rename to integrations/docker/images/stage-2/chip-build-telink/Dockerfile index c81581cd5b3066..567d735b52eb6c 100644 --- a/integrations/docker/images/chip-build-telink/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} as build +FROM ghcr.io/project-chip/chip-build:${VERSION} as build +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip RUN set -x \ && apt-get update \ @@ -39,7 +40,8 @@ RUN set -x \ && west zephyr-export \ && : # last line -FROM connectedhomeip/chip-build:${VERSION} +FROM ghcr.io/project-chip/chip-build:${VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip COPY --from=build /opt/telink/zephyr-sdk-0.16.1/ /opt/telink/zephyr-sdk-0.16.1/ COPY --from=build /opt/telink/zephyrproject/ /opt/telink/zephyrproject/ diff --git a/integrations/docker/images/stage-2/chip-build-telink/build.sh b/integrations/docker/images/stage-2/chip-build-telink/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-telink/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-telink/run.sh b/integrations/docker/images/stage-2/chip-build-telink/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-telink/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-telink/version b/integrations/docker/images/stage-2/chip-build-telink/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-telink/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-ti/Dockerfile b/integrations/docker/images/stage-2/chip-build-ti/Dockerfile similarity index 81% rename from integrations/docker/images/chip-build-ti/Dockerfile rename to integrations/docker/images/stage-2/chip-build-ti/Dockerfile index 649c8a4fc831b6..22be64824788e9 100644 --- a/integrations/docker/images/chip-build-ti/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-ti/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} +FROM ghcr.io/project-chip/chip-build:${VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip RUN set -x \ && apt-get update \ diff --git a/integrations/docker/images/stage-2/chip-build-ti/build.sh b/integrations/docker/images/stage-2/chip-build-ti/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-ti/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-ti/run.sh b/integrations/docker/images/stage-2/chip-build-ti/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-ti/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-ti/version b/integrations/docker/images/stage-2/chip-build-ti/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-ti/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-tizen/Dockerfile b/integrations/docker/images/stage-2/chip-build-tizen/Dockerfile similarity index 93% rename from integrations/docker/images/chip-build-tizen/Dockerfile rename to integrations/docker/images/stage-2/chip-build-tizen/Dockerfile index a81b034526ff70..ce276d2c73d610 100644 --- a/integrations/docker/images/chip-build-tizen/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-tizen/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build:${VERSION} +FROM ghcr.io/project-chip/chip-build:${VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip # ------------------------------------------------------------------------------ # Add group/user for tizen diff --git a/integrations/docker/images/stage-2/chip-build-tizen/build.sh b/integrations/docker/images/stage-2/chip-build-tizen/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-tizen/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-tizen/run.sh b/integrations/docker/images/stage-2/chip-build-tizen/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-tizen/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-tizen/tizen-sdk-installer/install.sh b/integrations/docker/images/stage-2/chip-build-tizen/tizen-sdk-installer/install.sh similarity index 100% rename from integrations/docker/images/chip-build-tizen/tizen-sdk-installer/install.sh rename to integrations/docker/images/stage-2/chip-build-tizen/tizen-sdk-installer/install.sh diff --git a/integrations/docker/images/chip-build-tizen/tizen-sdk-installer/secret-tool.py b/integrations/docker/images/stage-2/chip-build-tizen/tizen-sdk-installer/secret-tool.py similarity index 100% rename from integrations/docker/images/chip-build-tizen/tizen-sdk-installer/secret-tool.py rename to integrations/docker/images/stage-2/chip-build-tizen/tizen-sdk-installer/secret-tool.py diff --git a/integrations/docker/images/stage-2/chip-build-tizen/version b/integrations/docker/images/stage-2/chip-build-tizen/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-tizen/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-android/Dockerfile b/integrations/docker/images/stage-3/chip-build-android/Dockerfile similarity index 95% rename from integrations/docker/images/chip-build-android/Dockerfile rename to integrations/docker/images/stage-3/chip-build-android/Dockerfile index 03229d1fa679d2..62c759aa5fab92 100644 --- a/integrations/docker/images/chip-build-android/Dockerfile +++ b/integrations/docker/images/stage-3/chip-build-android/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build-java:${VERSION} +FROM ghcr.io/project-chip/chip-build-java:${VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip # JDK 8 access # JDK 8 is required because Android `sdkmanager` diff --git a/integrations/docker/images/stage-3/chip-build-android/build.sh b/integrations/docker/images/stage-3/chip-build-android/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-3/chip-build-android/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-3/chip-build-android/run.sh b/integrations/docker/images/stage-3/chip-build-android/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-3/chip-build-android/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-3/chip-build-android/version b/integrations/docker/images/stage-3/chip-build-android/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-3/chip-build-android/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-esp32-qemu/Dockerfile b/integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile similarity index 84% rename from integrations/docker/images/chip-build-esp32-qemu/Dockerfile rename to integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile index 6e69acf7f72478..527f361956223b 100644 --- a/integrations/docker/images/chip-build-esp32-qemu/Dockerfile +++ b/integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build-esp32:${VERSION} +FROM ghcr.io/project-chip/chip-build-esp32:${VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip RUN set -x \ && apt-get update \ diff --git a/integrations/docker/images/stage-3/chip-build-esp32-qemu/build.sh b/integrations/docker/images/stage-3/chip-build-esp32-qemu/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-3/chip-build-esp32-qemu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-3/chip-build-esp32-qemu/run.sh b/integrations/docker/images/stage-3/chip-build-esp32-qemu/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-3/chip-build-esp32-qemu/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-3/chip-build-esp32-qemu/version b/integrations/docker/images/stage-3/chip-build-esp32-qemu/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-3/chip-build-esp32-qemu/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-tizen-qemu/Dockerfile b/integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile similarity index 98% rename from integrations/docker/images/chip-build-tizen-qemu/Dockerfile rename to integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile index 78922ba8054ce4..625649d46fa9c1 100644 --- a/integrations/docker/images/chip-build-tizen-qemu/Dockerfile +++ b/integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile @@ -1,5 +1,6 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build-tizen:${VERSION} +FROM ghcr.io/project-chip/chip-build-tizen:${VERSION} +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip ENV TIZEN_IOT_QEMU_KERNEL $TIZEN_SDK_ROOT/iot-qemu-virt-zImage ENV TIZEN_IOT_IMAGE_ROOT $TIZEN_SDK_ROOT/iot-rootfs.img diff --git a/integrations/docker/images/stage-3/chip-build-tizen-qemu/build.sh b/integrations/docker/images/stage-3/chip-build-tizen-qemu/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-3/chip-build-tizen-qemu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-tizen-qemu/files/0001-smack-add-permissive-mode.patch b/integrations/docker/images/stage-3/chip-build-tizen-qemu/files/0001-smack-add-permissive-mode.patch similarity index 100% rename from integrations/docker/images/chip-build-tizen-qemu/files/0001-smack-add-permissive-mode.patch rename to integrations/docker/images/stage-3/chip-build-tizen-qemu/files/0001-smack-add-permissive-mode.patch diff --git a/integrations/docker/images/stage-3/chip-build-tizen-qemu/run.sh b/integrations/docker/images/stage-3/chip-build-tizen-qemu/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-3/chip-build-tizen-qemu/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-3/chip-build-tizen-qemu/version b/integrations/docker/images/stage-3/chip-build-tizen-qemu/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-3/chip-build-tizen-qemu/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile similarity index 75% rename from integrations/docker/images/chip-build-vscode/Dockerfile rename to integrations/docker/images/vscode/chip-build-vscode/Dockerfile index ddbfa8aac6d54b..35135ae238f87e 100644 --- a/integrations/docker/images/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile @@ -1,21 +1,24 @@ ARG VERSION=latest -FROM connectedhomeip/chip-build-nrf-platform:${VERSION} AS nrf -FROM connectedhomeip/chip-build-efr32:${VERSION} AS efr32 -FROM connectedhomeip/chip-build-android:${VERSION} AS android -FROM connectedhomeip/chip-build-esp32-qemu:${VERSION} as esp32 -FROM connectedhomeip/chip-build-mbed-os:${VERSION} AS mbedos -FROM connectedhomeip/chip-build-telink:${VERSION} AS telink -FROM connectedhomeip/chip-build-infineon:${VERSION} AS p6 -FROM connectedhomeip/chip-build-tizen:${VERSION} AS tizen -FROM connectedhomeip/chip-build-crosscompile:${VERSION} AS crosscompile -FROM connectedhomeip/chip-build-ameba:${VERSION} AS ameba -FROM connectedhomeip/chip-build-k32w:${VERSION} AS k32w -FROM connectedhomeip/chip-build-imx:${VERSION} AS imx -FROM connectedhomeip/chip-build-ti:${VERSION} AS ti -FROM connectedhomeip/chip-build-openiotsdk:${VERSION} AS openiotsdk -FROM connectedhomeip/chip-build-bouffalolab:${VERSION} AS bouffalolab -FROM connectedhomeip/chip-build-asr:${VERSION} AS asr -FROM connectedhomeip/chip-build:${VERSION} + +FROM ghcr.io/project-chip/chip-build-nrf-platform:${VERSION} AS nrf +FROM ghcr.io/project-chip/chip-build-efr32:${VERSION} AS efr32 +FROM ghcr.io/project-chip/chip-build-android:${VERSION} AS android +FROM ghcr.io/project-chip/chip-build-esp32-qemu:${VERSION} as esp32 +FROM ghcr.io/project-chip/chip-build-mbed-os:${VERSION} AS mbedos +FROM ghcr.io/project-chip/chip-build-telink:${VERSION} AS telink +FROM ghcr.io/project-chip/chip-build-infineon:${VERSION} AS p6 +FROM ghcr.io/project-chip/chip-build-tizen:${VERSION} AS tizen +FROM ghcr.io/project-chip/chip-build-crosscompile:${VERSION} AS crosscompile +FROM ghcr.io/project-chip/chip-build-ameba:${VERSION} AS ameba +FROM ghcr.io/project-chip/chip-build-k32w:${VERSION} AS k32w +FROM ghcr.io/project-chip/chip-build-imx:${VERSION} AS imx +FROM ghcr.io/project-chip/chip-build-ti:${VERSION} AS ti +FROM ghcr.io/project-chip/chip-build-openiotsdk:${VERSION} AS openiotsdk +FROM ghcr.io/project-chip/chip-build-bouffalolab:${VERSION} AS bouffalolab +FROM ghcr.io/project-chip/chip-build-asr:${VERSION} AS asr +FROM ghcr.io/project-chip/chip-build:${VERSION} + +LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip # qemu-src copied over because qemu directory contains symlinks to the src # folder (notably pc-bios are required to run qemu) @@ -31,7 +34,8 @@ COPY --from=android /opt/android/sdk /opt/android/sdk COPY --from=android /opt/android/android-ndk-r23c /opt/android/android-ndk-r23c COPY --from=android /usr/lib/kotlinc /usr/lib/kotlinc -COPY --from=mbedos /opt/openocd/ /opt/openocd/ +# FIXME: OpenOCD was removed during the move to infineon's repo +# COPY --from=mbedos /opt/openocd/ /opt/openocd/ COPY --from=p6 /opt/ModusToolbox /opt/ModusToolbox diff --git a/integrations/docker/images/vscode/chip-build-vscode/build.sh b/integrations/docker/images/vscode/chip-build-vscode/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/vscode/chip-build-vscode/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/vscode/chip-build-vscode/run.sh b/integrations/docker/images/vscode/chip-build-vscode/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/vscode/chip-build-vscode/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/vscode/chip-build-vscode/version b/integrations/docker/images/vscode/chip-build-vscode/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/vscode/chip-build-vscode/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/run.sh b/integrations/docker/run.sh index ae24ccef8610bc..922bcd4633061f 100755 --- a/integrations/docker/run.sh +++ b/integrations/docker/run.sh @@ -29,7 +29,9 @@ die() { exit 1 } -ORG=${DOCKER_RUN_ORG:-connectedhomeip} +ORG=${DOCKER_RUN_ORG:-project-chip} + +GHCR_ORG="ghcr.io" # directory name is IMAGE=${DOCKER_RUN_IMAGE:-$(basename "$here")} @@ -42,7 +44,7 @@ VERSION=${DOCKER_RUN_VERSION:-$(sed 's/ .*//' "$here/version")} || DOCKER_RUN_VERSION" # full image name -FULL_IMAGE_NAME="$ORG/$IMAGE${VERSION:+:${VERSION}}" +FULL_IMAGE_NAME="$GHCR_ORG/$ORG/$IMAGE${VERSION:+:${VERSION}}" # where RUN_DIR=${DOCKER_RUN_DIR:-$(pwd)} diff --git a/scripts/helpers/roll_docker_version.sh b/scripts/helpers/roll_docker_version.sh new file mode 100755 index 00000000000000..6d36981a46ab41 --- /dev/null +++ b/scripts/helpers/roll_docker_version.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +CURRENT_VERSION=$(sed 's/ .*//' ./integrations/docker/images/base/chip-build/version) + +echo "Current version: $CURRENT_VERSION" + +NEXT_VERSION=$((CURRENT_VERSION + 1)) + +echo "Next version: $NEXT_VERSION" + +echo "Rolling workflows" +sed -r -i "s|image: ghcr\.io/project-chip/(.*):[0-9]*(\..*)?|image: ghcr.io/project-chip/\1:$NEXT_VERSION|" .github/workflows/*.yaml + +echo "Rolling VSCode container" +sed -r -i "s|matter-dev-environment:local --version [0-9]*|matter-dev-environment:local --version $NEXT_VERSION|" .devcontainer/devcontainer.json + +echo "Rolling docker images" +sed -r -i "s|ARG VERSION=[0-9]*|ARG VERSION=$NEXT_VERSION|" integrations/docker/images/*/*/Dockerfile + +echo "Rolling main docker version" +echo "$NEXT_VERSION" >./integrations/docker/images/base/chip-build/version + +echo "Done" diff --git a/scripts/tests/cirque_tests.sh b/scripts/tests/cirque_tests.sh index 87e6c1e3475787..4796ecd2bffbd5 100755 --- a/scripts/tests/cirque_tests.sh +++ b/scripts/tests/cirque_tests.sh @@ -99,7 +99,7 @@ function __cirquetest_self_hash() { } function cirquetest_cachekey() { - echo "$("$REPO_DIR"/integrations/docker/ci-only-images/chip-cirque-device-base/cachekey.sh).openthread.$OPENTHREAD_CHECKOUT.cirque_test.$(__cirquetest_self_hash)" + echo "$("$REPO_DIR"/integrations/docker/images/stage-2/chip-cirque-device-base/cachekey.sh).openthread.$OPENTHREAD_CHECKOUT.cirque_test.$(__cirquetest_self_hash)" } function cirquetest_cachekeyhash() { @@ -116,12 +116,9 @@ function cirquetest_bootstrap() { make NO_GRPC=1 install -j - if [[ "$GITHUB_ACTION_RUN" = "1" ]]; then - # Note: This script will be invoked in docker on CI, We should add CHIP repo to safe directory to silent git error messages. - git config --global --add safe.directory /home/runner/work/connectedhomeip/connectedhomeip - fi + git config --global --add safe.directory /home/runner/work/connectedhomeip/connectedhomeip - "$REPO_DIR"/integrations/docker/ci-only-images/chip-cirque-device-base/build.sh + "$REPO_DIR"/integrations/docker/images/stage-2/chip-cirque-device-base/build.sh __cirquetest_build_ot_lazy pip3 install -r requirements_nogrpc.txt diff --git a/src/test_driver/linux-cirque/CommissioningFailureOnReportTest.py b/src/test_driver/linux-cirque/CommissioningFailureOnReportTest.py index b4c346bf3e45eb..877e141e588cd6 100755 --- a/src/test_driver/linux-cirque/CommissioningFailureOnReportTest.py +++ b/src/test_driver/linux-cirque/CommissioningFailureOnReportTest.py @@ -42,7 +42,7 @@ DEVICE_CONFIG = { 'device0': { 'type': 'MobileDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', @@ -51,7 +51,7 @@ }, 'device1': { 'type': 'CHIPEndDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', diff --git a/src/test_driver/linux-cirque/CommissioningFailureTest.py b/src/test_driver/linux-cirque/CommissioningFailureTest.py index dbb8dfebc09838..e56f396f2668f4 100755 --- a/src/test_driver/linux-cirque/CommissioningFailureTest.py +++ b/src/test_driver/linux-cirque/CommissioningFailureTest.py @@ -42,7 +42,7 @@ DEVICE_CONFIG = { 'device0': { 'type': 'MobileDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', @@ -51,7 +51,7 @@ }, 'device1': { 'type': 'CHIPEndDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', diff --git a/src/test_driver/linux-cirque/CommissioningTest.py b/src/test_driver/linux-cirque/CommissioningTest.py index adc6c21656dc53..6b6a93b9cd245b 100755 --- a/src/test_driver/linux-cirque/CommissioningTest.py +++ b/src/test_driver/linux-cirque/CommissioningTest.py @@ -43,7 +43,7 @@ DEVICE_CONFIG = { 'device0': { 'type': 'MobileDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', @@ -52,7 +52,7 @@ }, 'device1': { 'type': 'CHIPEndDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', @@ -61,7 +61,7 @@ }, 'device2': { 'type': 'CHIPEndDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', diff --git a/src/test_driver/linux-cirque/CommissioningWindowTest.py b/src/test_driver/linux-cirque/CommissioningWindowTest.py index 7c1a646c58c52e..a984da8db62db4 100755 --- a/src/test_driver/linux-cirque/CommissioningWindowTest.py +++ b/src/test_driver/linux-cirque/CommissioningWindowTest.py @@ -43,7 +43,7 @@ DEVICE_CONFIG = { 'device0': { 'type': 'MobileDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', @@ -52,7 +52,7 @@ }, 'device1': { 'type': 'CHIPEndDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', diff --git a/src/test_driver/linux-cirque/EchoOverTcpTest.py b/src/test_driver/linux-cirque/EchoOverTcpTest.py index b5a3a2471a9e48..98afc41f447c33 100755 --- a/src/test_driver/linux-cirque/EchoOverTcpTest.py +++ b/src/test_driver/linux-cirque/EchoOverTcpTest.py @@ -36,7 +36,7 @@ DEVICE_CONFIG = { 'device0': { 'type': 'CHIP-Echo-Requester', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'Interactive', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', @@ -45,7 +45,7 @@ }, 'device1': { 'type': 'CHIP-Echo-Responder', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'Interactive', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', diff --git a/src/test_driver/linux-cirque/EchoTest.py b/src/test_driver/linux-cirque/EchoTest.py index b76812dbf3aa4f..a144be49c7b79a 100755 --- a/src/test_driver/linux-cirque/EchoTest.py +++ b/src/test_driver/linux-cirque/EchoTest.py @@ -36,7 +36,7 @@ DEVICE_CONFIG = { 'device0': { 'type': 'CHIP-Echo-Requester', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'Interactive', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', @@ -45,7 +45,7 @@ }, 'device1': { 'type': 'CHIP-Echo-Responder', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'Interactive', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', diff --git a/src/test_driver/linux-cirque/FailsafeTest.py b/src/test_driver/linux-cirque/FailsafeTest.py index 3f75873cd5d683..98d11d69f61ea2 100755 --- a/src/test_driver/linux-cirque/FailsafeTest.py +++ b/src/test_driver/linux-cirque/FailsafeTest.py @@ -42,7 +42,7 @@ DEVICE_CONFIG = { 'device0': { 'type': 'MobileDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', @@ -51,7 +51,7 @@ }, 'device1': { 'type': 'CHIPEndDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', diff --git a/src/test_driver/linux-cirque/InteractionModelTest.py b/src/test_driver/linux-cirque/InteractionModelTest.py index 3884f0a125cd36..1d8ad29f6cab77 100755 --- a/src/test_driver/linux-cirque/InteractionModelTest.py +++ b/src/test_driver/linux-cirque/InteractionModelTest.py @@ -36,7 +36,7 @@ DEVICE_CONFIG = { 'device0': { 'type': 'CHIP-IM-Initiator', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'Interactive', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', @@ -45,7 +45,7 @@ }, 'device1': { 'type': 'CHIP-IM-Responder', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'Interactive', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', diff --git a/src/test_driver/linux-cirque/MobileDeviceTest.py b/src/test_driver/linux-cirque/MobileDeviceTest.py index 641b32d14ff544..508e636cb4f197 100755 --- a/src/test_driver/linux-cirque/MobileDeviceTest.py +++ b/src/test_driver/linux-cirque/MobileDeviceTest.py @@ -42,7 +42,7 @@ DEVICE_CONFIG = { 'device0': { 'type': 'MobileDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', @@ -51,7 +51,7 @@ }, 'device1': { 'type': 'CHIPEndDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', diff --git a/src/test_driver/linux-cirque/OnOffClusterTest.py b/src/test_driver/linux-cirque/OnOffClusterTest.py index 0bd78f2c8a5246..c2281059646b94 100755 --- a/src/test_driver/linux-cirque/OnOffClusterTest.py +++ b/src/test_driver/linux-cirque/OnOffClusterTest.py @@ -42,14 +42,14 @@ DEVICE_CONFIG = { 'device0': { 'type': 'CHIP-Server', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'Interactive', 'Mount'], 'rcp_mode': True, "mount_pairs": [[CHIP_REPO, CHIP_REPO]], }, 'device1': { 'type': 'CHIP-Tool', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'Interactive', 'Mount'], 'rcp_mode': True, "mount_pairs": [[CHIP_REPO, CHIP_REPO]], diff --git a/src/test_driver/linux-cirque/PythonCommissioningTest.py b/src/test_driver/linux-cirque/PythonCommissioningTest.py index c3f70c85760bac..ff8814368345ff 100755 --- a/src/test_driver/linux-cirque/PythonCommissioningTest.py +++ b/src/test_driver/linux-cirque/PythonCommissioningTest.py @@ -43,7 +43,7 @@ DEVICE_CONFIG = { 'device0': { 'type': 'MobileDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', @@ -52,7 +52,7 @@ }, 'device1': { 'type': 'CHIPEndDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', @@ -61,7 +61,7 @@ }, 'device2': { 'type': 'CHIPEndDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', diff --git a/src/test_driver/linux-cirque/README.md b/src/test_driver/linux-cirque/README.md index 11d2ce28f375df..051c2618f22a1d 100644 --- a/src/test_driver/linux-cirque/README.md +++ b/src/test_driver/linux-cirque/README.md @@ -16,7 +16,7 @@ If you don't want cirque break your local environment, you can enter a environment insider docker ``` -integrations/docker/images/chip-build-cirque/run.sh --privileged --volume /dev/pts:/dev/pts --volume /tmp:/tmp -it -- bash +integrations/docker/images/stage-2/chip-build-cirque/run.sh --privileged --volume /dev/pts:/dev/pts --volume /tmp:/tmp -it -- bash ``` ## Setting up cirque environment @@ -32,8 +32,8 @@ It will: 1. Install necessary packages required by cirque, -2. Build `connectedhomeip/chip-cirque-device-base:latest` docker image for - running devices, +2. Build `project-chip/chip-cirque-device-base:latest` docker image for running + devices, 3. Build openthread for simulating thread network. diff --git a/src/test_driver/linux-cirque/SplitCommissioningTest.py b/src/test_driver/linux-cirque/SplitCommissioningTest.py index ad4475fd92437d..78a08e82ec4989 100755 --- a/src/test_driver/linux-cirque/SplitCommissioningTest.py +++ b/src/test_driver/linux-cirque/SplitCommissioningTest.py @@ -41,7 +41,7 @@ DEVICE_CONFIG = { 'device0': { 'type': 'MobileDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', @@ -50,7 +50,7 @@ }, 'device1': { 'type': 'CHIPEndDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', @@ -59,7 +59,7 @@ }, 'device2': { 'type': 'CHIPEndDevice', - 'base_image': 'connectedhomeip/chip-cirque-device-base', + 'base_image': 'project-chip/chip-cirque-device-base', 'capability': ['Thread', 'TrafficControl', 'Mount'], 'rcp_mode': True, 'docker_network': 'Ipv6', diff --git a/src/test_driver/linux-cirque/topologies/one_node_one_android.json b/src/test_driver/linux-cirque/topologies/one_node_one_android.json index d7fbdeb3e83876..3b8abea4b9548f 100644 --- a/src/test_driver/linux-cirque/topologies/one_node_one_android.json +++ b/src/test_driver/linux-cirque/topologies/one_node_one_android.json @@ -1,7 +1,7 @@ { "device0": { "type": "CHIP-00", - "base_image": "connectedhomeip/chip-cirque-device-base", + "base_image": "project-chip/chip-cirque-device-base", "capability": ["Thread", "Interactive", "Mount"], "mount_pairs": [["{chip_repo}", "{chip_repo}"]], "rcp_mode": true diff --git a/src/test_driver/linux-cirque/topologies/three_node_with_ipv6.json b/src/test_driver/linux-cirque/topologies/three_node_with_ipv6.json index 251f3c30604c4f..f97eede81b18df 100644 --- a/src/test_driver/linux-cirque/topologies/three_node_with_ipv6.json +++ b/src/test_driver/linux-cirque/topologies/three_node_with_ipv6.json @@ -1,21 +1,21 @@ { "device0": { "type": "CHIP-00", - "base_image": "connectedhomeip/chip-cirque-device-base", + "base_image": "project-chip/chip-cirque-device-base", "docker_network": "Ipv6", "capability": ["Interactive", "Mount"], "mount_pairs": [["{chip_repo}", "{chip_repo}"]] }, "device1": { "type": "CHIP-01", - "base_image": "connectedhomeip/chip-cirque-device-base", + "base_image": "project-chip/chip-cirque-device-base", "docker_network": "Ipv6", "capability": ["Interactive", "Mount"], "mount_pairs": [["{chip_repo}", "{chip_repo}"]] }, "device2": { "type": "CHIP-02", - "base_image": "connectedhomeip/chip-cirque-device-base", + "base_image": "project-chip/chip-cirque-device-base", "docker_network": "Ipv6", "capability": ["Interactive", "Mount"], "mount_pairs": [["{chip_repo}", "{chip_repo}"]] diff --git a/src/test_driver/linux-cirque/topologies/three_node_with_ipvlan.json b/src/test_driver/linux-cirque/topologies/three_node_with_ipvlan.json index c16b4f10f2e292..54c07d4f46ec4e 100644 --- a/src/test_driver/linux-cirque/topologies/three_node_with_ipvlan.json +++ b/src/test_driver/linux-cirque/topologies/three_node_with_ipvlan.json @@ -1,21 +1,21 @@ { "device0": { "type": "CHIP-00", - "base_image": "connectedhomeip/chip-cirque-device-base", + "base_image": "project-chip/chip-cirque-device-base", "docker_network": "IpvLan", "capability": ["Interactive", "Mount"], "mount_pairs": [["{chip_repo}", "{chip_repo}"]] }, "device1": { "type": "CHIP-01", - "base_image": "connectedhomeip/chip-cirque-device-base", + "base_image": "project-chip/chip-cirque-device-base", "docker_network": "IpvLan", "capability": ["Interactive", "Mount"], "mount_pairs": [["{chip_repo}", "{chip_repo}"]] }, "device2": { "type": "CHIP-02", - "base_image": "connectedhomeip/chip-cirque-device-base", + "base_image": "project-chip/chip-cirque-device-base", "docker_network": "IpvLan", "capability": ["Interactive", "Mount"], "mount_pairs": [["{chip_repo}", "{chip_repo}"]] diff --git a/src/test_driver/linux-cirque/topologies/three_node_with_thread.json b/src/test_driver/linux-cirque/topologies/three_node_with_thread.json index d6892d22942d4c..0b9696e12bcefb 100644 --- a/src/test_driver/linux-cirque/topologies/three_node_with_thread.json +++ b/src/test_driver/linux-cirque/topologies/three_node_with_thread.json @@ -1,21 +1,21 @@ { "device0": { "type": "CHIP-00", - "base_image": "connectedhomeip/chip-cirque-device-base", + "base_image": "project-chip/chip-cirque-device-base", "capability": ["Thread", "Interactive", "Mount"], "mount_pairs": [["{chip_repo}", "{chip_repo}"]], "rcp_mode": true }, "device1": { "type": "CHIP-01", - "base_image": "connectedhomeip/chip-cirque-device-base", + "base_image": "project-chip/chip-cirque-device-base", "capability": ["Thread", "Interactive", "Mount"], "mount_pairs": [["{chip_repo}", "{chip_repo}"]], "rcp_mode": true }, "device2": { "type": "CHIP-02", - "base_image": "connectedhomeip/chip-cirque-device-base", + "base_image": "project-chip/chip-cirque-device-base", "capability": ["Thread", "Interactive", "Mount"], "mount_pairs": [["{chip_repo}", "{chip_repo}"]], "rcp_mode": true diff --git a/src/test_driver/linux-cirque/topologies/two_node_with_thread.json b/src/test_driver/linux-cirque/topologies/two_node_with_thread.json index 15021c4add5177..4da678ec784031 100644 --- a/src/test_driver/linux-cirque/topologies/two_node_with_thread.json +++ b/src/test_driver/linux-cirque/topologies/two_node_with_thread.json @@ -1,14 +1,14 @@ { "device0": { "type": "CHIP-00", - "base_image": "connectedhomeip/chip-cirque-device-base", + "base_image": "project-chip/chip-cirque-device-base", "capability": ["Thread", "Interactive", "Mount"], "mount_pairs": [["{chip_repo}", "{chip_repo}"]], "rcp_mode": true }, "device1": { "type": "CHIP-01", - "base_image": "connectedhomeip/chip-cirque-device-base", + "base_image": "project-chip/chip-cirque-device-base", "capability": ["Thread", "Interactive", "Mount"], "mount_pairs": [["{chip_repo}", "{chip_repo}"]], "rcp_mode": true diff --git a/src/test_driver/tizen/README.md b/src/test_driver/tizen/README.md index 85a91563183b42..fc815d85f081aa 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 connectedhomeip/chip-build-tizen-qemu:latest +docker pull ghcr.io/project-chip/chip-build-tizen-qemu:latest ``` ## 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 \ - connectedhomeip/chip-build-tizen-qemu:latest /bin/bash + ghcr.io/project-chip/chip-build-tizen-qemu:latest /bin/bash ``` ### Clone the connectedhomeip repository