Skip to content

Commit f0ff499

Browse files
committed
Simplify environment setup
ARG is just an ENV that doesn't persist outside of the file. No need to chain.
1 parent ad01d3e commit f0ff499

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

Dockerfile.tester

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ RUN . /opt/ros/jazzy/setup.sh \
4141
# result stage: base + copied install folders from the overlay + service setup.
4242
FROM base
4343

44-
ARG DATASET_NAME
45-
ARG OUTPUT_DIR=/submission
46-
ARG OUTPUT_FILENAME=submission.csv
47-
ARG SERVICE_PACKAGE=ibpc_tester
48-
ARG SERVICE_EXECUTABLE_NAME=ibpc_tester
49-
ARG SPLIT_TYPE=val
50-
5144
RUN apt update \
5245
&& sudo apt install curl -y \
5346
&& curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg \
@@ -67,12 +60,13 @@ RUN sed --in-place \
6760
--expression '$isource "/opt/ros/overlay/install/setup.bash"' \
6861
/ros_entrypoint.sh
6962

70-
ENV DATASET_NAME=${DATASET_NAME}
71-
ENV OUTPUT_DIR=${OUTPUT_DIR}
72-
ENV OUTPUT_FILENAME=${OUTPUT_FILENAME}
73-
ENV SERVICE_PACKAGE=${SERVICE_PACKAGE}
74-
ENV SERVICE_EXECUTABLE_NAME=${SERVICE_EXECUTABLE_NAME}
75-
ENV SPLIT_TYPE=${SPLIT_TYPE}
63+
64+
ENV DATASET_NAME=ipd
65+
ENV OUTPUT_DIR=/submission
66+
ENV OUTPUT_FILENAME=submission.csv
67+
ENV SERVICE_PACKAGE=ibpc_tester
68+
ENV SERVICE_EXECUTABLE_NAME=ibpc_tester
69+
ENV SPLIT_TYPE=val
7670

7771
CMD exec /opt/ros/overlay/install/lib/${SERVICE_PACKAGE}/${SERVICE_EXECUTABLE_NAME} \
7872
--ros-args -p dataset_name:=${DATASET_NAME} -p split_type:=${SPLIT_TYPE} -p output_dir:=${OUTPUT_DIR} -p output_filename:=${OUTPUT_FILENAME}

0 commit comments

Comments
 (0)