Skip to content

Commit b3045e6

Browse files
committed
Fix some hadolint warnings
1 parent 81a9ab9 commit b3045e6

2 files changed

Lines changed: 16 additions & 10 deletions

File tree

Dockerfile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ ARG CUDA_PATH
66
ENV PATH="$CUDA_PATH/bin:$PATH"
77

88
# Update package list & install some basic tools we'll need.
9-
RUN apt-get update
10-
RUN apt-get install -y python3-dev python3-pip python3-venv make g++ wget git
9+
# hadolint ignore=DL3009,DL3008
10+
RUN apt-get update && \
11+
apt-get install -y make g++ wget git --no-install-recommends && \
12+
apt-get install -y python3-dev python3-pip python3-venv --no-install-recommends
1113

1214
# Ubuntu 24's version of CMake is 3.28. We need a newer version.
1315
RUN apt-get remove --purge --auto-remove cmake
14-
RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.31.7/cmake-3.31.7-linux-x86_64.sh
15-
RUN sh cmake-3.31.7-linux-x86_64.sh --prefix=/usr/local --skip-license
16+
RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.31.7/cmake-3.31.7-linux-x86_64.sh && \
17+
sh cmake-3.31.7-linux-x86_64.sh --prefix=/usr/local --skip-license
1618

1719
# Copy relevant files for simulation.
1820
COPY ./Makefile /qsim/Makefile
@@ -31,8 +33,9 @@ RUN python3 -m venv --upgrade-deps test_env
3133
ENV PATH="/test_env/bin:$PATH"
3234

3335
# Install qsim requirements.
34-
RUN python3 -m pip install -r /qsim/requirements.txt
35-
RUN python3 -m pip install -r /qsim/dev-requirements.txt
36+
# hadolint ignore=DL3042
37+
RUN python3 -m pip install -r /qsim/requirements.txt && \
38+
python3 -m pip install -r /qsim/dev-requirements.txt
3639

3740
# Compile qsim.
3841
WORKDIR /qsim/

install/tests/Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ ARG CUDA_PATH
66
ENV PATH="$CUDA_PATH/bin:$PATH"
77

88
# Update package list & install some basic tools we'll need.
9-
RUN apt-get update
10-
RUN apt-get install -y python3-dev python3-pip python3-venv make g++ wget git
9+
# hadolint ignore=DL3009,DL3008
10+
RUN apt-get update && \
11+
apt-get install -y make g++ wget git --no-install-recommends && \
12+
apt-get install -y python3-dev python3-pip python3-venv --no-install-recommends
1113

1214
# Ubuntu 24's version of CMake is 3.28. We need a newer version.
1315
RUN apt-get remove --purge --auto-remove cmake
14-
RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.31.7/cmake-3.31.7-linux-x86_64.sh
15-
RUN sh cmake-3.31.7-linux-x86_64.sh --prefix=/usr/local --skip-license
16+
RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.31.7/cmake-3.31.7-linux-x86_64.sh && \
17+
sh cmake-3.31.7-linux-x86_64.sh --prefix=/usr/local --skip-license
1618

1719
# Copy qsim files from the outside-Docker location to an inside-Docker location.
1820
COPY ./ /qsim/
@@ -29,6 +31,7 @@ ENV PATH="/qsim/test_env/bin:$PATH"
2931
# Install qsim from sources.
3032
# Note: use pip3 here, not python3 -m pip. We need to make sure to get the pip
3133
# installed inside the venv, because that one has the correct sys.path.
34+
# hadolint ignore=DL3042
3235
RUN pip3 install -v /qsim/
3336

3437
# Copy the tests to a non-qsim directory.

0 commit comments

Comments
 (0)