Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pinning all versions, fixing script #28140

Merged
merged 2 commits into from
Jul 21, 2023
Merged

Pinning all versions, fixing script #28140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be69ad2
Pinning version, fixing script
woody-apple Jul 20, 2023
de08cdc
Restyled by shfmt
restyled-commits Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/all-clusters-app/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
#

from generic_node_image
FROM generic_node_image
RUN apt-get install -y libglib2.0
COPY out/debug/chip-all-clusters-app /usr/bin/
COPY entrypoint.sh /
Expand Down
3 changes: 2 additions & 1 deletion examples/bridge-app/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
# limitations under the License.
#

FROM ghcr.io/project-chip/chip-cirque-device-base:latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-cirque-device-base:${VERSION}
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

COPY out/debug/chip-bridge-app /usr/bin/
Expand Down
3 changes: 2 additions & 1 deletion examples/chip-tool/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
# limitations under the License.
#

FROM ghcr.io/project-chip/chip-cirque-device-base:latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-cirque-device-base:${VERSION}
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

COPY out/debug/chip-tool /usr/bin/
Expand Down
3 changes: 2 additions & 1 deletion examples/lighting-app/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
# limitations under the License.
#

FROM ghcr.io/project-chip/chip-cirque-device-base:latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-cirque-device-base:${VERSION}
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

COPY out/debug/chip-lighting-app /usr/bin/
Expand Down
3 changes: 2 additions & 1 deletion examples/resource-monitoring-app/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
# limitations under the License.
#

FROM connectedhomeip/chip-cirque-device-base:latest
ARG VERSION=1
FROM connectedhomeip/chip-cirque-device-base:${VERSION}

COPY out/debug/chip-resource-monitoring-app /usr/bin/
COPY entrypoint.sh /
Expand Down
4 changes: 2 additions & 2 deletions examples/shell/telink/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ You can use this example as a reference for creating your own application.
1. Pull docker image from repository:

```bash
$ docker pull connectedhomeip/chip-build-telink:latest
$ docker pull ghcr.io/project-chip/chip-build-telink:1
```

1. Run docker container:

```bash
$ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" connectedhomeip/chip-build-telink:latest
$ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1
```

here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay
Expand Down
4 changes: 2 additions & 2 deletions examples/smoke-co-alarm-app/telink/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ You can use this example as a reference for creating your own application.
1. Pull docker image from repository:

```bash
$ docker pull connectedhomeip/chip-build-telink:latest
$ docker pull ghcr.io/project-chip/chip-build-telink:1
```

1. Run docker container:

```bash
$ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" connectedhomeip/chip-build-telink:latest
$ docker run -it --rm -v ${CHIP_BASE}:/root/chip -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" ghcr.io/project-chip/chip-build-telink:1
```

here `${CHIP_BASE}` is directory which contains CHIP repo files **!!!Pay
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION} as build
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-ameba/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION}
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-asr/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION}
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-bouffalolab/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION}
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-efr32/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION}
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-esp32/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION} as build
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-imx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION} as build
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-infineon/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION}
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-java/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION}
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-k32w/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION} as build
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-mbed-os/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION} as build
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1

# ==================================================
# Temporary image for SDK and dependencies download
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION} as build
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-telink/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION} as build
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-ti/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION}
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-2/chip-build-tizen/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION}
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-3/chip-build-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build-java:${VERSION}
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build-esp32:${VERSION}
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1
FROM ghcr.io/project-chip/chip-build-tizen:${VERSION}
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/vscode/chip-build-vscode/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=latest
ARG VERSION=1

FROM ghcr.io/project-chip/chip-build-nrf-platform:${VERSION} AS nrf
FROM ghcr.io/project-chip/chip-build-efr32:${VERSION} AS efr32
Expand Down
2 changes: 1 addition & 1 deletion scripts/helpers/roll_docker_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ echo "Rolling VSCode container"
sed -r -i "s|matter-dev-environment:local --version [0-9,a-z,A-Z,-]*|matter-dev-environment:local --version $NEXT_VERSION|" .devcontainer/devcontainer.json

echo "Rolling docker images"
find . -iname readme.md -not -path "./third_party/*" | xargs sed -r -i "s|ARG VERSION=[0-9,a-z,A-Z,-]*|ARG VERSION=$NEXT_VERSION|"
find . -iname Dockerfile -not -path "./third_party/*" | xargs sed -r -i "s|ARG VERSION=[0-9,a-z,A-Z,-]*|ARG VERSION=$NEXT_VERSION|"

echo "Rolling main docker version"
echo "$NEXT_VERSION : $ROLL_REASON" >./integrations/docker/images/base/chip-build/version
Expand Down
2 changes: 1 addition & 1 deletion third_party/silabs/gecko_sdk
Open in desktop
Submodule gecko_sdk updated 19375 files