From f7bb050f1ed89ce18c4415a35eb127dfba0bcf79 Mon Sep 17 00:00:00 2001 From: Vanessasaurus Date: Thu, 23 May 2019 19:26:11 -0400 Subject: [PATCH] fixing 2.6 (#53) * fixing 2.6 Signed-off-by: Vanessa Sochat * typo Signed-off-by: Vanessa Sochat --- .circleci/config.yml | 3 --- docker2singularity.sh | 7 +++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4bcf1be..e945eb1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 diff --git a/docker2singularity.sh b/docker2singularity.sh index aa5ec43..3168b7a 100644 --- a/docker2singularity.sh +++ b/docker2singularity.sh @@ -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 @@ -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..."