@@ -19,8 +19,7 @@ ENV NO_PROXY=$NOPROXY
19
19
ENV HTTP_PROXY=$HTTPPROXY
20
20
ENV HTTPS_PROXY=$HTTPSPROXY
21
21
22
- ARG ZSDK_VERSION=0.12.4
23
- ARG ZSDK_ALT_VERSION=0.13.1
22
+ ARG ZSDK_VERSION=0.13.2
24
23
ARG GCC_ARM_NAME=gcc-arm-none-eabi-10-2020-q4-major
25
24
ARG CMAKE_VERSION=3.20.5
26
25
ARG RENODE_VERSION=1.12.0
@@ -167,10 +166,6 @@ RUN cd /opt/bsim && \
167
166
# sh "zephyr-sdk-${ZSDK_VERSION}-x86_64-linux-setup.run" --quiet -- -d /opt/toolchains/zephyr-sdk-${ZSDK_VERSION} && \
168
167
# rm "zephyr-sdk-${ZSDK_VERSION}-x86_64-linux-setup.run"
169
168
170
- # RUN wget ${WGET_ARGS} https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZSDK_ALT_VERSION}/zephyr-sdk-${ZSDK_ALT_VERSION}-linux-x86_64-setup.run && \
171
- # sh "zephyr-sdk-${ZSDK_ALT_VERSION}-linux-x86_64-setup.run" --quiet -- -d /opt/toolchains/zephyr-sdk-${ZSDK_ALT_VERSION} && \
172
- # rm "zephyr-sdk-${ZSDK_ALT_VERSION}-linux-x86_64-setup.run"
173
-
174
169
# Install github-cli per https://github.com/cli/cli/blob/trunk/docs/install_linux.md
175
170
RUN apt update && apt install -y --no-install-recommends curl && \
176
171
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg && \
@@ -208,7 +203,7 @@ RUN chmod -R 755 /opt/1rtos
208
203
209
204
# Set the locale
210
205
ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
211
- ENV ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZSDK_ALT_VERSION }
206
+ ENV ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZSDK_VERSION }
212
207
ENV GNUARMEMB_TOOLCHAIN_PATH=/opt/toolchains/${GCC_ARM_NAME}
213
208
ENV PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
214
209
0 commit comments