Skip to content

Commit 1c5b924

Browse files
authored
Use new ENV syntax in Dockerfile (#37834)
1 parent 4e3f1cd commit 1c5b924

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

.devcontainer/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh
2222
ARG USERNAME=vscode
2323
ARG USER_UID=1000
2424
ARG USER_GID=$USER_UID
25-
ENV LANG en_US.utf8
25+
ENV LANG=en_US.utf8
2626

2727

2828
# These are installed for terminal/dev convenience. If more tooling for build is required, please
@@ -81,17 +81,17 @@ RUN sed -i '/^TIZEN_SDK_DATA_PATH/d' $TIZEN_SDK_ROOT/sdk.info \
8181
&& ln -sf /home/$USERNAME/.tizen-cli-config $TIZEN_SDK_ROOT/tools/.tizen-cli-config \
8282
&& : # last line
8383

84-
ENV TIZEN_ROOTFS /tizen_rootfs
84+
ENV TIZEN_ROOTFS=/tizen_rootfs
8585

8686
# Fast Model GDB plugins path for debugging support
87-
ENV FAST_MODEL_PLUGINS_PATH /opt/FastModelsPortfolio_11.16/plugins/Linux64_GCC-9.3
87+
ENV FAST_MODEL_PLUGINS_PATH=/opt/FastModelsPortfolio_11.16/plugins/Linux64_GCC-9.3
8888

8989
# Set up ccache as a pigweed command launcher when using the scripts/build/build_examples.py
9090
# script. Also, set up icecc as the command prefix for ccache. Such setup allows to benefit
9191
# from compilation caching and distributed compilation at the same time.
9292
#
9393
# NOTE: In order to use distributed compilation with icecc, one should run
9494
# "scripts/icecc.sh start" before starting the build.
95-
ENV CHIP_PW_COMMAND_LAUNCHER ccache
96-
ENV CCACHE_PREFIX icecc
97-
ENV PATH /usr/lib/ccache:$PATH
95+
ENV CHIP_PW_COMMAND_LAUNCHER=ccache
96+
ENV CCACHE_PREFIX=icecc
97+
ENV PATH=/usr/lib/ccache:$PATH

integrations/docker/images/stage-2/chip-build-java/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ RUN set -x \
1919
&& rm -f kotlinc/bin/*.bat \
2020
&& : # last line
2121

22-
ENV PATH $PATH:/usr/lib/kotlinc/bin
22+
ENV PATH=$PATH:/usr/lib/kotlinc/bin
2323
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64

integrations/docker/images/stage-2/chip-build-tizen/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ RUN set -x \
2020

2121
# ------------------------------------------------------------------------------
2222
# Install tizen
23-
ENV TIZEN_VERSION 8.0
24-
ENV TIZEN_SDK_ROOT /opt/tizen-sdk
23+
ENV TIZEN_VERSION=8.0
24+
ENV TIZEN_SDK_ROOT=/opt/tizen-sdk
2525

2626
COPY tizen-sdk-installer $TIZEN_SDK_ROOT/files/installer
2727
RUN set -x \
@@ -34,8 +34,8 @@ RUN set -x \
3434

3535
# ------------------------------------------------------------------------------
3636
# Set environment
37-
ENV TIZEN_SDK_TOOLCHAIN $TIZEN_SDK_ROOT/tools/arm-linux-gnueabi-gcc-9.2
38-
ENV TIZEN_SDK_SYSROOT $TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/tizen/rootstraps/tizen-$TIZEN_VERSION-device.core
37+
ENV TIZEN_SDK_TOOLCHAIN=$TIZEN_SDK_ROOT/tools/arm-linux-gnueabi-gcc-9.2
38+
ENV TIZEN_SDK_SYSROOT=$TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/tizen/rootstraps/tizen-$TIZEN_VERSION-device.core
3939
ENV PATH="$TIZEN_SDK_TOOLCHAIN/bin:$TIZEN_SDK_ROOT/tools/ide/bin:$TIZEN_SDK_ROOT/tools:$PATH"
4040

4141
# ------------------------------------------------------------------------------

integrations/docker/images/stage-2/chip-cirque-device-base/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ FROM ubuntu:24.04
22

33
ARG OT_BR_POSIX_CHECKOUT=main
44

5-
ENV DEBIAN_FRONTEND noninteractive
6-
ENV PLATFORM ubuntu
7-
ENV DOCKER 1
5+
ENV DEBIAN_FRONTEND=noninteractive
6+
ENV PLATFORM=ubuntu
7+
ENV DOCKER=1
88
ENV OT_BR_POSIX_CHECKOUT=${OT_BR_POSIX_CHECKOUT}
99

1010
RUN mkdir /app

integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ ARG VERSION=1
22
FROM ghcr.io/project-chip/chip-build-tizen:${VERSION}
33
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
44

5-
ENV TIZEN_IOT_QEMU_KERNEL $TIZEN_SDK_ROOT/iot-qemu-virt-zImage
6-
ENV TIZEN_IOT_IMAGE_ROOT $TIZEN_SDK_ROOT/iot-rootfs.img
7-
ENV TIZEN_IOT_IMAGE_DATA $TIZEN_SDK_ROOT/iot-sysdata.img
5+
ENV TIZEN_IOT_QEMU_KERNEL=$TIZEN_SDK_ROOT/iot-qemu-virt-zImage
6+
ENV TIZEN_IOT_IMAGE_ROOT=$TIZEN_SDK_ROOT/iot-rootfs.img
7+
ENV TIZEN_IOT_IMAGE_DATA=$TIZEN_SDK_ROOT/iot-sysdata.img
88

99
# ------------------------------------------------------------------------------
1010
# Switch to the root user so we could install things

integrations/docker/images/vscode/chip-build-vscode/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ RUN set -x \
104104
&& rm -rf /var/lib/apt/lists/ \
105105
&& : # last line
106106

107-
ENV PATH $PATH:/usr/lib/kotlinc/bin
107+
ENV PATH=$PATH:/usr/lib/kotlinc/bin
108108
ENV AMEBA_PATH=/opt/ameba/ambd_sdk_with_chip_non_NDA
109109
ENV ANDROID_HOME=/opt/android/sdk
110110
ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r23c
@@ -113,7 +113,7 @@ ENV SILABS_BOARD=BRD4186C
113113
# Keep GSDK_ROOT name until rename transition to SISDK is completed
114114
ENV GSDK_ROOT=/opt/silabs/simplicity_sdk/
115115
ENV SISDK_ROOT=/opt/silabs/simplicity_sdk/
116-
ENV PATH $PATH:/opt/silabs/slc_cli/
116+
ENV PATH=$PATH:/opt/silabs/slc_cli/
117117
ENV WISECONNECT_SDK_ROOT=/opt/silabs/wiseconnect-wifi-bt-sdk/
118118
ENV WIFI_SDK_ROOT=/opt/silabs/wifi_sdk
119119
ENV IDF_PATH=/opt/espressif/esp-idf/
@@ -140,10 +140,10 @@ ENV NXP_SDK_PATH=/opt/nxp
140140
# NOTE: This directory is NOT persistent.
141141
ENV PW_ENVIRONMENT_ROOT=/home/vscode/pigweed/env
142142

143-
ENV TIZEN_VERSION 8.0
144-
ENV TIZEN_SDK_ROOT /opt/tizen-sdk
145-
ENV TIZEN_SDK_TOOLCHAIN $TIZEN_SDK_ROOT/tools/arm-linux-gnueabi-gcc-9.2
146-
ENV TIZEN_SDK_SYSROOT $TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/tizen/rootstraps/tizen-$TIZEN_VERSION-device.core
143+
ENV TIZEN_VERSION=8.0
144+
ENV TIZEN_SDK_ROOT=/opt/tizen-sdk
145+
ENV TIZEN_SDK_TOOLCHAIN=$TIZEN_SDK_ROOT/tools/arm-linux-gnueabi-gcc-9.2
146+
ENV TIZEN_SDK_SYSROOT=$TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/tizen/rootstraps/tizen-$TIZEN_VERSION-device.core
147147

148148
ENV FVP_CORSTONE_300_PATH=/opt/FVP_Corstone_SSE-300
149149
ENV BOUFFALOLAB_SDK_ROOT=/opt/bouffalolab_sdk

0 commit comments

Comments
 (0)