Skip to content

Commit

Permalink
Fix mount-farm (#10)
Browse files Browse the repository at this point in the history
* Update mount-farm script
* Update poststart.sh
  • Loading branch information
prete authored Mar 2, 2020
1 parent 7afcfe0 commit d1addd1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,8 @@ COPY files/data /home/jovyan/data
COPY files/notebooks /home/jovyan/notebooks

# copy mount script
COPY mount-farm.sh /
COPY mount-farm /usr/local/bin/mount-farm
RUN chmod +x /usr/local/bin/mount-farm

# copy poststart script
COPY poststart.sh /
2 changes: 1 addition & 1 deletion mount-farm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

FARM_LOGIN=farm5-login
FARM_LOGIN=farm5-login.internal.sanger.ac.uk

MOUNTED_DIRS=$(mount | grep sshfs | awk '{print $3}' | grep -E "^(/nfs|/lustre|/warehouse)$")
if [[ ! -z ${MOUNTED_DIRS} ]];
Expand Down
4 changes: 0 additions & 4 deletions poststart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ sudo mkdir -p /nfs
sudo mkdir -p /lustre
sudo mkdir -p /warehouse

# copy mount-farm so its avaiable on the user's path
sudo chmod +x /mount-farm.sh
sudo cp /mount-farm.sh /usr/local/bin/mount-farm

# start docker service
sudo service docker start

Expand Down

0 comments on commit d1addd1

Please sign in to comment.