Use skopeo for multiarch

FIWARE · Apr 26, 2024 · e69f7e1 · e69f7e1
1 parent b195139
commit e69f7e1
Show file tree

Hide file tree

Showing 41 changed files with 84 additions and 205 deletions.
diff --git a/.github/fiware/core/cygnus.sh b/.github/fiware/core/cygnus.sh
@@ -19,14 +19,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/draco.sh b/.github/fiware/core/draco.sh
@@ -18,14 +18,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/o2kconnector.sh b/.github/fiware/core/o2kconnector.sh
@@ -19,14 +19,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/orion.sh b/.github/fiware/core/orion.sh
@@ -18,14 +18,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/pyspark-connector.sh b/.github/fiware/core/pyspark-connector.sh
@@ -20,14 +20,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/quantum-leap.sh b/.github/fiware/core/quantum-leap.sh
@@ -18,14 +18,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/scorpio-at-context-server.sh b/.github/fiware/core/scorpio-at-context-server.sh
@@ -20,14 +20,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/scorpio-entity-manager.sh b/.github/fiware/core/scorpio-entity-manager.sh
@@ -19,14 +19,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/scorpio-history-entity.sh b/.github/fiware/core/scorpio-history-entity.sh
@@ -20,14 +20,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/scorpio-history-query.sh b/.github/fiware/core/scorpio-history-query.sh
@@ -20,14 +20,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/scorpio-query-manager.sh b/.github/fiware/core/scorpio-query-manager.sh
@@ -20,14 +20,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/scorpio-registry-manager.sh b/.github/fiware/core/scorpio-registry-manager.sh
@@ -20,14 +20,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/scorpio-subscription-manager.sh b/.github/fiware/core/scorpio-subscription-manager.sh
@@ -17,16 +17,14 @@ function dateDiff {
     echo $(((`date -jf %Y-%m-%d "$CURRENTDATE" +%s` - `date -jf %Y-%m-%d "$1" +%s`)/86400))
 }
 echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
+
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/scorpio-subscription-registry.sh b/.github/fiware/core/scorpio-subscription-registry.sh
@@ -20,14 +20,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/scorpio.sh b/.github/fiware/core/scorpio.sh
@@ -19,14 +19,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/sth-comet.sh b/.github/fiware/core/sth-comet.sh
@@ -18,14 +18,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/core/x-ngsijs.sh b/.github/fiware/core/x-ngsijs.sh
@@ -15,14 +15,11 @@ exit 0
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/iot-agents/iotagent-json.sh b/.github/fiware/iot-agents/iotagent-json.sh
@@ -17,16 +17,14 @@ function dateDiff {
 }
 echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
+
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/iot-agents/iotagent-lightweightM2M.sh b/.github/fiware/iot-agents/iotagent-lightweightM2M.sh
@@ -19,14 +19,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/iot-agents/iotagent-sigfox.sh b/.github/fiware/iot-agents/iotagent-sigfox.sh
@@ -19,14 +19,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/iot-agents/iotagent-ultralight.sh b/.github/fiware/iot-agents/iotagent-ultralight.sh
@@ -19,14 +19,11 @@ echo "$SOURCE - $VERSION - $(dateDiff $DATE) days old."
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/iot-agents/x-OpenMTC.sh b/.github/fiware/iot-agents/x-OpenMTC.sh
@@ -15,14 +15,11 @@ exit 0
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }
 

diff --git a/.github/fiware/iot-agents/x-iotagent-LoRaWAN.sh b/.github/fiware/iot-agents/x-iotagent-LoRaWAN.sh
@@ -16,14 +16,11 @@ exit 0
 
 function clone {
    echo 'cloning from '"$1 $2"' to '"$3"
-   docker pull -q "$1":"$2"
-   docker tag "$1":"$2" "$3":"$2"
-   docker push -q "$3":"$2"
+   skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":"$2"
 
    if ! [ -z "$4" ]; then
         echo 'pushing '"$1 $2"' to latest'
-        docker tag "$1":"$2" "$3":latest
-        docker push -q "$3":latest
+        skopeo copy --multi-arch all docker://"$1":"$2"  docker://"$3":latest
    fi
 }