Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,6 @@ RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain none
# hadolint ignore=DL3004,SC3009
RUN <<EOF
set -e
# set setgid on /workspace to inherit dev group
chown root:dev /workspace
chmod g+ws /workspace
umask 002
mkdir -p /workspace/simics/ispm/

# Download SIMICS components
Expand Down Expand Up @@ -163,7 +159,6 @@ cargo install cargo-simics-build
# Build the project
cargo simics-build -r

umask 002
# Install the built package
ispm packages -i target/release/*-linux64.ispm --non-interactive --trust-insecure-packages

Expand All @@ -185,7 +180,6 @@ WORKDIR /workspace/projects/example/
# hadolint ignore=DL3004,SC3009
RUN <<EOF
set -e
umask 002
# Create the example project
ispm projects /workspace/projects/example/ --create \
1000-${PUBLIC_SIMICS_PACKAGE_VERSION_1000} \
Expand All @@ -207,6 +201,9 @@ EOF

RUN <<EOF
set -e
# set perms root:dev and set permissions for dev group members
chown -R root:dev /workspace
chmod -R 775 /workspace
# copy ISPM config to vscode user
cp -r "/root/.config" "/home/${USERNAME}/.config"
chown -R "${USERNAME}:dev" "/home/${USERNAME}/.config"
Expand Down
Loading