Skip to content

Commit

Permalink
Simplify build.sh run instructions.
Browse files Browse the repository at this point in the history
  • Loading branch information
jlb6740 committed Nov 20, 2023
1 parent 9ddfe85 commit 10e0986
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ENV PATH=/root/.cargo/bin:${PATH}
RUN apt-get install -y --no-install-recommends clang

# Install python
RUN apt-get install -y --no-install-recommends python3.10 libpython3.10 python3-distutils python3-pip
RUN apt-get install -y --no-install-recommends python3.8 libpython3.8 python3-distutils python3-pip
RUN python3 -m pip install termgraph \
&& python3 -m pip install pandas \
&& python3 -m pip install termcolor \
Expand Down
15 changes: 2 additions & 13 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,8 @@ docker tag ${IMAGE_NAME} ${IMAGE_NAME}_${ARCH}_${KERNEL}:latest
docker tag ${IMAGE_NAME} ${IMAGE_NAME}_${ARCH}_${KERNEL}:${IMAGE_VER}

echo ""
echo "The entry point is a wrapper to the python script 'wasmscore.py'"
echo "The entry point is a wrapper to the python script 'wasmscore.py'."
echo ""
echo "To run from this local build use command (for a list of more options use --help):"
echo "> docker run -ti ${IMAGE_NAME} <options>"
echo ""
echo "To stop and rm all ${IMAGE_NAME} containers:"
echo "> docker rm \$(docker stop \$(docker ps -a -q --filter ancestor=${IMAGE_NAME}:latest --format="{{.ID}}"))"
echo ""
echo "For a detached setup that allows for copying files to the image or"
echo "entering the container, use the following commands:"
echo "> docker run --entrypoint=/bin/bash -ti -d ${IMAGE_NAME}"
echo "> wasmscore_container_id=\$(docker ps | grep -m 1 ${IMAGE_NAME} | awk '{ print \$1 }')"
echo ""
echo "> docker cp <file> \${wasmscore_container_id}:"
echo "or"
echo "> docker exec -ti \${wasmscore_container_id}" /bin/bash
echo ""
2 changes: 1 addition & 1 deletion wasmscore.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
cd sightglass
python3.10 ./wasmscore.py $@
python3 ./wasmscore.py $@
cd - > /dev/null

0 comments on commit 10e0986

Please sign in to comment.