Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixing 2.6 #53

Merged
merged 2 commits into from
May 23, 2019
Merged

fixing 2.6 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c402fe
fixing 2.6
vsoch May 23, 2019
31d14e3
typo
vsoch May 23, 2019
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
3 changes: 0 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
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
View file
Open in desktop
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