@@ -23,50 +23,50 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
2323# - Rust (will be on the PATH due to the ENV command above)
2424RUN dnf -y update && \
2525 dnf -y install \
26- alsa-lib \
27- atk \
28- bash \
29- clang \
30- clang-libs \
31- clang-resource-filesystem \
32- clang-tools-extra \
33- cmake \
34- cups \
35- curl \
36- dosfstools \
37- g++ \
38- gcc \
39- git \
40- git-lfs \
41- glibc-devel \
42- glibc-devel.i686 \
43- glibc-static \
44- glibc-static.i686 \
45- gtk3 \
46- lld \
47- lld-devel \
48- lld-libs \
49- llvm \
50- llvm-libs \
51- llvm-static \
52- make \
53- mesa-libgbm \
54- mtools \
55- ninja-build \
56- openssl \
57- openssl-devel \
58- openssl-libs \
59- python3 \
60- python3-pip \
61- vim \
62- yamllint && \
26+ alsa-lib \
27+ atk \
28+ bash \
29+ clang \
30+ clang-libs \
31+ clang-resource-filesystem \
32+ clang-tools-extra \
33+ cmake \
34+ cups \
35+ curl \
36+ dosfstools \
37+ g++ \
38+ gcc \
39+ git \
40+ git-lfs \
41+ glibc-devel \
42+ glibc-devel.i686 \
43+ glibc-static \
44+ glibc-static.i686 \
45+ gtk3 \
46+ lld \
47+ lld-devel \
48+ lld-libs \
49+ llvm \
50+ llvm-libs \
51+ llvm-static \
52+ make \
53+ mesa-libgbm \
54+ mtools \
55+ ninja-build \
56+ openssl \
57+ openssl-devel \
58+ openssl-libs \
59+ python3 \
60+ python3-pip \
61+ vim \
62+ yamllint && \
6363 python3 -m pip install --no-cache-dir \
64- black==23.10.1 \
65- flake8==6.1.0 \
66- isort==5.12.0 \
67- mypy==1.6.1 \
68- pylint==3.0.2 && \
69- curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain nightly
64+ black==23.10.1 \
65+ flake8==6.1.0 \
66+ isort==5.12.0 \
67+ mypy==1.6.1 \
68+ pylint==3.0.2 && \
69+ curl https://sh.rustup.rs -sSf | bash -s -- -y
7070
7171
7272WORKDIR /workspace
@@ -78,10 +78,10 @@ RUN mkdir -p /workspace/simics/ispm/ && \
7878 curl --noproxy '*.intel.com' -L -o /workspace/simics/ispm.tar.gz "${PUBLIC_SIMICS_ISPM_URL}" && \
7979 curl --noproxy '*.intel.com' -L -o /workspace/simics/simics.ispm "${PUBLIC_SIMICS_PKGS_URL}" && \
8080 tar -C /workspace/simics/ispm --strip-components=1 \
81- -xf /workspace/simics/ispm.tar.gz && \
81+ -xf /workspace/simics/ispm.tar.gz && \
8282 ispm settings install-dir /workspace/simics && \
8383 ispm packages --install-bundle /workspace/simics/simics.ispm --non-interactive \
84- --trust-insecure-packages && \
84+ --trust-insecure-packages && \
8585 rm /workspace/simics/ispm.tar.gz /workspace/simics/simics.ispm && \
8686 rm -rf /workspace/simics-6-packages/
8787
@@ -96,8 +96,8 @@ WORKDIR /workspace/tsffs/
9696RUN cargo install cargo-simics-build && \
9797 cargo simics-build -r && \
9898 ispm packages \
99- -i target/release/*-linux64.ispm \
100- --non-interactive --trust-insecure-packages
99+ -i target/release/*-linux64.ispm \
100+ --non-interactive --trust-insecure-packages
101101
102102WORKDIR /workspace/projects/example/
103103
@@ -123,6 +123,3 @@ RUN ispm projects /workspace/projects/example/ --create \
123123 ninja
124124
125125RUN echo 'echo "To run the demo, run ./simics -no-gui --no-win fuzz.simics"' >> /root/.bashrc
126-
127-
128-
0 commit comments