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.

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

Update to 0.17.0 #10

Merged
merged 2 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
sdk: [0.16.9]
sdk: [0.17.0]

steps:
- name: Checkout repository
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:

strategy:
matrix:
sdk: [0.16.9]
sdk: [0.17.0]
toolchain: [
{ arch: "aarch64-zephyr-elf", nick: "aarch64"},
{ arch: "arc64-zephyr-elf", nick: "arc64"},
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:

strategy:
matrix:
sdk: [0.16.9]
sdk: [0.17.0]

steps:
- name: Checkout repository
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ Building images locally ensures you can trust the source of the image, as well a
_Build the base image_

```
docker build --build-arg ZEPHYR_SDK_VERSION=0.16.4 -f "./zephyr-base/Dockerfile" -t zephyr:base-0.16.4SDK "./zephyr-base"
docker build --build-arg ZEPHYR_SDK_VERSION=0.17.0 -f "./zephyr-base/Dockerfile" -t zephyr:base-0.17.0SDK "./zephyr-base"

```

_To build an image for Arm Cortex-M targets:_


```
docker build --build-arg BASE_IMAGE="zephyr:base-0.16.4SDK" --build-arg ZEPHYR_SDK_TOOLCHAINS="-t arm-zephyr-eabi" -f "./zephyr/Dockerfile" -t zephyr:arm-0.16.4SDK "./zephyr"
docker build --build-arg BASE_IMAGE="zephyr:base-0.17.0SDK" --build-arg ZEPHYR_SDK_TOOLCHAINS="-t arm-zephyr-eabi" -f "./zephyr/Dockerfile" -t zephyr:arm-0.17.0SDK "./zephyr"
```

_To build an image for multiple toolchains:_

```
docker build --build-arg BASE_IMAGE="zephyr:base-0.16.4SDK" --build-arg ZEPHYR_SDK_TOOLCHAINS="-t arm-zephyr-eabi -t x86_64-zephyr-elf" -f "./zephyr/Dockerfile" -t zephyr:arm_x86-0.16.4SDK "./zephyr"
docker build --build-arg BASE_IMAGE="zephyr:base-0.17.0SDK" --build-arg ZEPHYR_SDK_TOOLCHAINS="-t arm-zephyr-eabi -t x86_64-zephyr-elf" -f "./zephyr/Dockerfile" -t zephyr:arm_x86-0.17.0SDK "./zephyr"
```

_There is a different Dockerfile for Posix target like `native_sim`. To build:_

```
docker build --build-arg BASE_IMAGE="zephyr:base-0.16.4SDK" -f "./zephyr-posix/Dockerfile" -t zephyr:posix-0.16.4SDK "./zephyr-posix"
docker build --build-arg BASE_IMAGE="zephyr:base-0.17.0SDK" -f "./zephyr-posix/Dockerfile" -t zephyr:posix-0.17.0SDK "./zephyr-posix"
```
2 changes: 1 addition & 1 deletion zephyr-posix/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ZEPHYR_SDK_VERSION=0.16.4
ARG ZEPHYR_SDK_VERSION=0.17.0
ARG ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZEPHYR_SDK_VERSION}
ARG BASE_IMAGE="zephyr:base-${ZEPHYR_SDK_VERSION}SDK"

Expand Down
2 changes: 1 addition & 1 deletion zephyr/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ZEPHYR_SDK_VERSION=0.16.4
ARG ZEPHYR_SDK_VERSION=0.17.0
ARG ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZEPHYR_SDK_VERSION}
ARG ZEPHYR_SDK_TOOLCHAINS="-t arm-zephyr-eabi"
ARG BASE_IMAGE="zephyr:base-${ZEPHYR_SDK_VERSION}SDK"
Expand Down