chore: resolve merge conflict

Author: andhreljaKern

dc/registry_delete.sh

@@ -30,8 +30,6 @@ do
 done
 
 
-<<<<<<< HEAD
-=======
 function validate_image_tag() {
     manifest=$1
     image=$2
@@ -43,18 +41,10 @@ function validate_image_tag() {
     fi
 }
 
->>>>>>> b63724af1a7542546a7f1694f540e0015d447a62
 # Delete images older than DELETE_SINCE_DAYS and exit 0
 if [ -n "$DELETE_SINCE_DAYS" ]; then
     echo "::notice::Deleting images older than $DELETE_SINCE_DAYS days"
     repo_tags=$(curl -s -u $HTTPS_USERNAME https://$REGISTRY_URL/v2/$GITHUB_OWNER/$APP_NAME/tags/list | jq -r '.tags[]')
-<<<<<<< HEAD
-    echo $repo_tags | while read -r tag ; do
-        created=$(curl -s -u $HTTPS_USERNAME \
-            https://$REGISTRY_URL/v2/$GITHUB_OWNER/$APP_NAME/manifests/$tag \
-            | jq -r '.history[0].v1Compatibility' | jq -r '.created')
-        
-=======
     while IFS= read -r tag; do
         manifest=$(curl -s -u $HTTPS_USERNAME \
             -H "Accept: application/vnd.docker.distribution.manifest.v2+json" \
@@ -65,7 +55,6 @@ if [ -n "$DELETE_SINCE_DAYS" ]; then
         created=$(curl -s -u $HTTPS_USERNAME \
             https://$REGISTRY_URL/v2/$GITHUB_OWNER/$APP_NAME/manifests/$tag \
             | jq -r '.history[0].v1Compatibility' | jq -r '.created')
->>>>>>> b63724af1a7542546a7f1694f540e0015d447a62
         created_date=$(date -d $created +%s)
         current_date=$(date +%s)
         days_since=$(( (current_date - created_date) / (60*60*24) ))
@@ -75,20 +64,12 @@ if [ -n "$DELETE_SINCE_DAYS" ]; then
                 -H "Accept: application/vnd.docker.distribution.manifest.v2+json" \
                 https://$REGISTRY_URL/v2/$GITHUB_OWNER/$APP_NAME/manifests/$tag \
                 | sha256sum | cut -d ' ' -f 1)
-<<<<<<< HEAD
-            curl -X DELETE -u $HTTPS_USERNAME https://$REGISTRY_URL/v2/$GITHUB_OWNER/$APP_NAME/manifests/sha256:$digest
-=======
             curl -X DELETE -u $HTTPS_USERNAME -s https://$REGISTRY_URL/v2/$GITHUB_OWNER/$APP_NAME/manifests/sha256:$digest
->>>>>>> b63724af1a7542546a7f1694f540e0015d447a62
             echo "::warning::deleted $APP_NAME:$tag, $days_since days old"
         else
             echo "$APP_NAME:$tag is $days_since days old"
         fi
-<<<<<<< HEAD
-    done
-=======
     done <<< "$repo_tags"
->>>>>>> b63724af1a7542546a7f1694f540e0015d447a62
     exit 0
 fi
 
@@ -98,25 +79,13 @@ if [ -n $DELETE_TAG ]; then
         -H "Accept: application/vnd.docker.distribution.manifest.v2+json" \
         https://$REGISTRY_URL/v2/$GITHUB_OWNER/$APP_NAME/manifests/$DELETE_TAG)
 
-<<<<<<< HEAD
-    errors=$(echo $manifest | jq -r '.errors')
-    if [ $errors != null ]; then
-        echo "::error::$REGISTRY_URL/$APP_NAME:$DELETE_TAG not found"
-        exit 1
-    fi
-    
-    digest=$(echo $manifest | sha256sum | cut -d ' ' -f 1)
-    
-    curl -X DELETE -u $HTTPS_USERNAME \
-=======
     validate_image_tag "$manifest" "$REGISTRY_URL/$GITHUB_OWNER/$APP_NAME:$DELETE_TAG"
 
     digest=$(curl -s -u $HTTPS_USERNAME \
         -H "Accept: application/vnd.docker.distribution.manifest.v2+json" \
         https://$REGISTRY_URL/v2/$GITHUB_OWNER/$APP_NAME/manifests/$DELETE_TAG \
         | sha256sum | cut -d ' ' -f 1)
     curl -X DELETE -u $HTTPS_USERNAME -s \
->>>>>>> b63724af1a7542546a7f1694f540e0015d447a62
         https://$REGISTRY_URL/v2/$GITHUB_OWNER/$APP_NAME/manifests/sha256:$digest
 
     echo "::warning::deleted $REGISTRY_URL/$GITHUB_OWNER/$APP_NAME:$DELETE_TAG"