Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Added a universal writable .astropy directory to be able to call the …
Browse files Browse the repository at this point in the history
…docker image as a regular user to that simdir will have the correct ownership
  • Loading branch information
daminton committed Jun 4, 2023
1 parent acf1bb8 commit ae98dd8
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 189 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -187,5 +187,7 @@ RUN conda update --all -y
COPY ./python/ .
COPY --from=build /usr/local/bin/swiftest_driver /bin/
RUN cd swiftest && conda develop .
RUN mkdir -p /.astropy && \
chmod -R 777 /.astropy
ENV SHELL="/bin/bash"
ENTRYPOINT ["/opt/conda/bin/python"]
9 changes: 2 additions & 7 deletions docker/.gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
*
!.gitignore
!install.sh
!gnu/
!gnu/Dockerfile
!/gnu/bin/
!/gnu/bin/swiftest_driver
!intel/
!intel/Dockerfile
!/intel/bin/swiftest_driver
!bin
!bin/swiftest
2 changes: 2 additions & 0 deletions docker/bin/swiftest
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh --
docker run -v $(pwd):$(pwd) -w $(pwd) --user "$(id -u):$(id -g)" -t -e OMP_NUM_THREADS -e FOR_COARRAY_NUM_IMAGES swiftest:1.0.0 "$@"
44 changes: 0 additions & 44 deletions docker/gnu/Dockerfile

This file was deleted.

Empty file removed docker/gnu/bin/.gitignore
Empty file.
2 changes: 0 additions & 2 deletions docker/gnu/bin/swiftest_driver

This file was deleted.

8 changes: 4 additions & 4 deletions docker/install.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh --
tag=${1:-intel}
echo "Installing swiftest_driver:${tag} Docker container and executable script"
docker pull daminton/swiftest_driver:${tag}
cp -rf ${tag}/bin/swiftest_driver ../bin/
tag=${1:-latest}
echo "Installing swiftest:${tag} Docker container and executable script"
docker pull daminton/swiftest:${tag}
cp -rf bin/swiftest ../bin/
129 changes: 0 additions & 129 deletions docker/intel/Dockerfile

This file was deleted.

3 changes: 0 additions & 3 deletions swiftest.sh

This file was deleted.

0 comments on commit ae98dd8

Please sign in to comment.