Skip to content

Commit 163cdc5

Browse files
authored
Merge pull request #17 from embeddedcontainers/fix/dockerfile-warnings
docker: fix ARG scoping, remove cache-defeating cleanup, quiet tar
2 parents be35027 + 147ad7e commit 163cdc5

3 files changed

Lines changed: 9 additions & 13 deletions

File tree

zephyr-base/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
3838
xz-utils \
3939
&& wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/${sdk_file_name}" \
4040
&& mkdir -p ${ZEPHYR_SDK_INSTALL_DIR} \
41-
&& tar -xvf ${sdk_file_name} -C ${ZEPHYR_SDK_INSTALL_DIR} --strip-components=1 \
41+
&& tar -xf ${sdk_file_name} -C ${ZEPHYR_SDK_INSTALL_DIR} --strip-components=1 \
4242
&& ${ZEPHYR_SDK_INSTALL_DIR}/setup.sh -c \
4343
&& rm ${sdk_file_name} \
4444
&& apt-get remove -y --purge \
4545
wget \
4646
xz-utils \
47-
&& apt-get autoremove -y \
48-
&& apt-get clean \
49-
&& rm -rf /var/lib/apt/lists/*
47+
&& apt-get autoremove -y

zephyr-posix/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ FROM ${BASE_IMAGE}
77

88
# OS dependencies and Zephyr SDK posix setup
99

10-
ARG ZEPHYR_SDK_INSTALL_DIR
10+
ARG ZEPHYR_SDK_VERSION=1.0.0
11+
ARG ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZEPHYR_SDK_VERSION}
1112

1213
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
1314
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
@@ -19,6 +20,4 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
1920
&& ${ZEPHYR_SDK_INSTALL_DIR}/setup.sh -c \
2021
&& apt-get remove -y --purge \
2122
wget \
22-
&& apt-get autoremove -y \
23-
&& apt-get clean \
24-
&& rm -rf /var/lib/apt/lists/*
23+
&& apt-get autoremove -y

zephyr/Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ FROM ${BASE_IMAGE}
88

99
# Target architecture SDK
1010

11-
ARG ZEPHYR_SDK_INSTALL_DIR
12-
ARG ZEPHYR_SDK_TOOLCHAINS
11+
ARG ZEPHYR_SDK_VERSION=1.0.0
12+
ARG ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZEPHYR_SDK_VERSION}
13+
ARG ZEPHYR_SDK_TOOLCHAINS="-t arm-zephyr-eabi"
1314

1415
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
1516
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
@@ -21,6 +22,4 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
2122
&& apt-get remove -y --purge \
2223
wget \
2324
xz-utils \
24-
&& apt-get autoremove -y \
25-
&& apt-get clean \
26-
&& rm -rf /var/lib/apt/lists/*
25+
&& apt-get autoremove -y

0 commit comments

Comments
 (0)