Skip to content

Commit

Permalink
fixing 2.6 (#53)
Browse files Browse the repository at this point in the history
* fixing 2.6

Signed-off-by: Vanessa Sochat <vsochat@stanford.edu>

* typo

Signed-off-by: Vanessa Sochat <vsochat@stanford.edu>
  • Loading branch information
vsoch committed May 23, 2019
1 parent cbfe060 commit f7bb050
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
3 changes: 0 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ dockerdeploy: &dockerdeploy
if [[ -n "$DOCKER_PASS" ]]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push ${CONTAINER_NAME}:${DOCKER_TAG}
echo "Tagging latest image..."
docker tag ${CONTAINER_NAME}:${DOCKER_TAG} ${CONTAINER_NAME}:latest
docker push ${CONTAINER_NAME}:latest
fi
dockerbuild: &dockerbuild
Expand Down
7 changes: 5 additions & 2 deletions docker2singularity.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# USAGE: docker2singularity.sh ubuntu:14.04
#
#
# Copyright (c) 2016-2018 Vanessa Sochat, All Rights Reserved
# Copyright (c) 2016-2019 Vanessa Sochat, All Rights Reserved
# Copyright (c) 2017 Singularityware LLC and AUTHORS
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down Expand Up @@ -289,11 +289,14 @@ rm -rf $TMPDIR
################################################################################
if [ "${mount_points}" ] ; then
echo "(6/10) Adding mount points..."
mkdir -p "${build_sandbox}/${mount_points}"
for mount_point in ${mount_points}; do
mkdir -p "${build_sandbox}/${mount_point}"
done
else
echo "(6/10) Skipping mount points..."
fi


# making sure that any user can read and execute everything in the container
echo "(7/10) Fixing permissions..."

Expand Down

0 comments on commit f7bb050

Please sign in to comment.