From 3faafab732d15717e4ac65b09e69109ddd484050 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Tue, 20 Feb 2024 09:37:52 -0700 Subject: [PATCH] changing -S to -e to verify if docker is the container runtime due to the way that Jenkins pods are setup --- gen3/bin/ecr.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gen3/bin/ecr.sh b/gen3/bin/ecr.sh index 930202a876..85746d6953 100644 --- a/gen3/bin/ecr.sh +++ b/gen3/bin/ecr.sh @@ -71,7 +71,7 @@ ecrReg="707767160287.dkr.ecr.us-east-1.amazonaws.com" # lib ------------------------------- gen3_ecr_login() { - if [[ -S /var/run/docker.sock ]]; then + if [[ -e /var/run/docker.sock ]]; then if gen3_time_since ecr-login is 36000; then # re-authenticate every 10 hours aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin "707767160287.dkr.ecr.us-east-1.amazonaws.com" 1>&2 || exit 1 @@ -87,7 +87,7 @@ gen3_ecr_login() { gen3_quay_login() { if [[ -f ~/Gen3Secrets/quay/login ]]; then - if [[ -S /var/run/docker.sock ]]; then + if [[ -e /var/run/docker.sock ]]; then if gen3_time_since quay-login is 36000; then cat ~/Gen3Secrets/quay/login | docker login --username cdis+gen3 --password-stdin quay.io fi @@ -125,7 +125,7 @@ gen3_ecr_copy_image() { fi shift shift - if [[ -S /var/run/docker.sock ]]; then + if [[ -e /var/run/docker.sock ]]; then (docker pull "$srcTag" && \ docker tag "$srcTag" "$destTag" && \ docker push "$destTag"