From dbd933623b6cd23b4b1e4cbbec6af23478ffe411 Mon Sep 17 00:00:00 2001 From: Vanessa Sochat Date: Thu, 5 Sep 2019 12:44:45 -0400 Subject: [PATCH 1/2] updating build for quay Signed-off-by: Vanessa Sochat --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6711772..9185903 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,6 @@ # # CONTAINER_NAME # DOCKER_USER -# DOCKER_EMAIL ################################################################################ # Functions @@ -19,7 +18,7 @@ defaults: &defaults - image: docker:18.01.0-ce-git working_directory: /tmp/src environment: - - CONTAINER_NAME: singularityware/docker2singularity + - CONTAINER_NAME: quay.io/singularity/docker2singularity # Installation @@ -40,7 +39,6 @@ dockerload: &dockerload pigz -d --stdout /tmp/cache/container.tar.gz | docker load fi - dockersave: &dockersave name: Docker Save no_output_timeout: 40m From 469834df613ebf2d19255829abc91af8afe9d7b8 Mon Sep 17 00:00:00 2001 From: Vanessa Sochat Date: Thu, 5 Sep 2019 12:55:06 -0400 Subject: [PATCH 2/2] missing quay.io Signed-off-by: Vanessa Sochat --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9185903..5af9758 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,7 +58,7 @@ dockerdeploy: &dockerdeploy DOCKER_TAG="v$(cat VERSION)" echo "Container name set to ${CONTAINER_NAME}:${DOCKER_TAG}" if [[ -n "$DOCKER_PASS" ]]; then - docker login -u $DOCKER_USER -p $DOCKER_PASS + docker login -u "${DOCKER_USER}" -p "${DOCKER_PASS}" quay.io docker push ${CONTAINER_NAME}:${DOCKER_TAG} echo "Tagging latest image..." docker tag ${CONTAINER_NAME}:${DOCKER_TAG} ${CONTAINER_NAME}:latest