From ac39480c97fb2c40abdb0dd35496d1e5a10f4d40 Mon Sep 17 00:00:00 2001 From: "Stanislav N. aka pztrn" Date: Tue, 28 Jun 2022 20:25:11 +0500 Subject: [PATCH] Add devnulls and fix login function's log output. --- .drone.yml | 2 +- mirror.sh | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index bb75b66..397c869 100644 --- a/.drone.yml +++ b/.drone.yml @@ -28,7 +28,7 @@ steps: privileged: true environment: REGISTRY: code.pztrn.name - REGISTRY_PROJECT: /containers/mirrors + REGISTRY_PROJECT: /containers/mirror REGISTRY_USERNAME: drone REGISTRY_PASSWORD: from_secret: drone_secret diff --git a/mirror.sh b/mirror.sh index 5c0b6bb..7d4f9ca 100755 --- a/mirror.sh +++ b/mirror.sh @@ -105,7 +105,7 @@ function get_arm64_image() { function login_to_registry() { # Login to registry. - echo "Logging into '${REGISTRY}' as '${USER}'..." + echo "Logging into '${REGISTRY}' as '${REGISTRY_USERNAME}'..." docker login -u "${REGISTRY_USERNAME}" -p "${REGISTRY_PASSWORD}" "${REGISTRY}" } @@ -132,12 +132,16 @@ function mirror() { function push_multiarch_image() { local image=$1 - if ! docker push "${REMOTE_IMAGE}"-amd64; then + if ! docker push "${REMOTE_IMAGE}"-amd64 &> /dev/null; then echo -e "\t! amd64 image push failed!" + else + echo -e "\t* amd64 image pushed" fi - if ! docker push "${REMOTE_IMAGE}"-arm64; then + if ! docker push "${REMOTE_IMAGE}"-arm64 &> /dev/null; then echo -e "\t! arm64 image push failed!" + else + echo -e "\t* arm64 image pushed" fi if [ ${MULTIARCH} -eq 1 ]; then