diff --git a/.github/workflows/build-docker.sh b/.github/workflows/build-docker.sh index ae18ae1a..a85c223d 100644 --- a/.github/workflows/build-docker.sh +++ b/.github/workflows/build-docker.sh @@ -91,12 +91,16 @@ time rclone copy $IMAGE_HOME/${IMAGENAME}_${BUILDDATE}.simg nectar:/neurodesk/te echo "[DEBUG] Done with uploading to Nectar Object Storage!" echo "[DEBUG] Attempting upload to AWS Object Storage:" -curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && unzip awscliv2.zip && sudo ./aws/install && rm -rf aws awscliv2.zip -# time rclone copy $IMAGE_HOME/${IMAGENAME}_${BUILDDATE}.simg aws-neurocontainers:/neurocontainers/temporary-builds-new + +# check if aws cli is installed +if ! command -v aws &> /dev/null +then + echo "[DEBUG] Installing AWS CLI" + curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && unzip awscliv2.zip && sudo ./aws/install && rm -rf aws awscliv2.zip +fi time aws s3 cp $IMAGE_HOME/${IMAGENAME}_${BUILDDATE}.simg s3://neurocontainers/temporary-builds-new echo "[DEBUG] Done with uploading to AWS Object Storage!" -# if curl --output /dev/null --silent --head --fail "https://object-store.rc.nectar.org.au/v1/AUTH_dead991e1fa847e3afcca2d3a7041f5d/neurodesk/temporary-builds-new/${IMAGENAME}_${BUILDDATE}.simg"; then if curl --output /dev/null --silent --head --fail "https://neurocontainers.neurodesk.org/temporary-builds-new/${IMAGENAME}_${BUILDDATE}.simg"; then echo "[DEBUG] ${IMAGENAME}_${BUILDDATE}.simg was freshly build and exists now :)" echo "[DEBUG] cleaning up $IMAGE_HOME/${IMAGENAME}_${BUILDDATE}.simg"