This is an automated email from the ASF dual-hosted git repository.

msciabarra pushed a commit to branch check-containerd
in repository https://gitbox.apache.org/repos/asf/openserverless-task.git

commit c8fa3111324ed19dec34d97dbc3cd1cb61481701
Author: Michele Sciabarra <[email protected]>
AuthorDate: Sun Jul 6 09:07:40 2025 +0100

    check containerd
---
 prereq.yml               | 96 ++++++++++++++++++++++++------------------------
 setup/docker/opsfile.yml | 38 +++++++++----------
 setup/opsfile.yml        | 21 ++++++-----
 3 files changed, 78 insertions(+), 77 deletions(-)

diff --git a/prereq.yml b/prereq.yml
index 342bc5f..03f2ab9 100644
--- a/prereq.yml
+++ b/prereq.yml
@@ -162,7 +162,7 @@ tasks:
   uv:
     desc: install uv
     vars:
-      VERSION: "0.6.7"
+      VERSION: "0.7.19"
       FILE:
          sh: |
              case "{{.OS}}-{{.ARCH}}" in
@@ -170,7 +170,7 @@ tasks:
               linux-arm64) echo uv-aarch64-unknown-linux-gnu.tar.gz ;;
               darwin-arm64) echo uv-aarch64-apple-darwin.tar.gz ;;
               darwin-amd64) echo uv-x86_64-apple-darwin.tar.gz ;;
-              windows-*) echo uv-aarch64-pc-windows-msvc.zip ;;
+              windows-*) echo uv-x86_64-pc-windows-msvc.zip ;;
               *) echo "unknown" ;;
              esac
       URL: 
"https://github.com/astral-sh/uv/releases/download/{{.VERSION}}/{{.FILE}}";
@@ -180,29 +180,29 @@ tasks:
     - extract "{{.FILE}}" "{{.OUT}}{{.EXE}}"
     - remove "{{.FILE}}"
 
-  hugo:
-    desc: download hugo
-    vars:
-      VERSION: 0.145.0
-      SUFFIX:
-         sh: |
-             case "{{.OS}}-{{.ARCH}}" in
-              linux-amd64) echo Linux-64bit.tar.gz ;;
-              linux-arm64) echo "linux-arm64.tar.gz" ;;
-              darwin-arm64) echo darwin-universal.tar.gz ;;
-              darwin-amd64) echo darwin-universal.tar.gz ;;
-              windows-*) echo windows-amd64.zip ;;
-              *) echo "unknown" ;;
-             esac
-      URL: 
"https://github.com/gohugoio/hugo/releases/download/v{{.VERSION}}/hugo_extended_{{.VERSION}}_{{.SUFFIX}}";
-      FILE: "{{base .URL}}"
-      OUT: hugo
-    cmds:
-    - task: download-and-extract
-      vars:
-        URL: "{{.URL}}"
-        FILE: "{{.FILE}}"
-        OUT: "{{.OUT}}"
+  #hugo:
+  #  desc: download hugo
+  #  vars:
+  #    VERSION: 0.145.0
+  #    SUFFIX:
+  #       sh: |
+  #           case "{{.OS}}-{{.ARCH}}" in
+  #            linux-amd64) echo Linux-64bit.tar.gz ;;
+  #            linux-arm64) echo "linux-arm64.tar.gz" ;;
+  #            darwin-arm64) echo darwin-universal.tar.gz ;;
+  #            darwin-amd64) echo darwin-universal.tar.gz ;;
+  #            windows-*) echo windows-amd64.zip ;;
+  #            *) echo "unknown" ;;
+  #           esac
+  #    URL: 
"https://github.com/gohugoio/hugo/releases/download/v{{.VERSION}}/hugo_extended_{{.VERSION}}_{{.SUFFIX}}";
+  #    FILE: "{{base .URL}}"
+  #    OUT: hugo
+  #  cmds:
+  #  - task: download-and-extract
+  #    vars:
+  #      URL: "{{.URL}}"
+  #      FILE: "{{.FILE}}"
+  #      OUT: "{{.OUT}}"
 
   helm:
     desc: download helm
@@ -228,27 +228,27 @@ tasks:
           FILE: "{{.FILE}}"
           OUT: "{{.OUT}}"
 
-  k3d:
-    desc: download k3d
-    vars:
-      VERSION: "5.6.3"
-      SUFFIX:
-        sh: |
-          case "{{.OS}}-{{.ARCH}}" in
-            linux-amd64) echo "k3d-linux-amd64" ;;
-            linux-arm64) echo "k3d-linux-arm64" ;;
-            darwin-amd64) echo "k3d-darwin-amd64" ;;
-            darwin-arm64) echo "k3d-darwin-arm64" ;;
-            windows-amd64) echo "k3d-windows-amd64.exe" ;;
-            *) echo "unknown" ;;
-          esac
-      URL: 
"https://github.com/k3d-io/k3d/releases/download/v{{.VERSION}}/{{.SUFFIX}}";
-      OUT: k3d
-    cmds:
-      - task: download
-        vars:
-          URL: "{{.URL}}"
-          OUT: "{{.OUT}}{{.EXE}}"
+  #k3d:
+  #  desc: download k3d
+  #  vars:
+  #    VERSION: "5.6.3"
+  #    SUFFIX:
+  #      sh: |
+  #        case "{{.OS}}-{{.ARCH}}" in
+  #          linux-amd64) echo "k3d-linux-amd64" ;;
+  #          linux-arm64) echo "k3d-linux-arm64" ;;
+  #          darwin-amd64) echo "k3d-darwin-amd64" ;;
+  #          darwin-arm64) echo "k3d-darwin-arm64" ;;
+  #         windows-amd64) echo "k3d-windows-amd64.exe" ;;
+  #          *) echo "unknown" ;;
+  #        esac
+  #    URL: 
"https://github.com/k3d-io/k3d/releases/download/v{{.VERSION}}/{{.SUFFIX}}";
+  #    OUT: k3d
+  #  cmds:
+  #    - task: download
+  #      vars:
+  #        URL: "{{.URL}}"
+  #        OUT: "{{.OUT}}{{.EXE}}"
 
   all:
     - task: 7zz
@@ -259,9 +259,9 @@ tasks:
     - task: kubectl
     - task: rg
     - task: uv
-    - task: hugo
+    #- task: hugo
     - task: helm
-    - task: k3d
+    #- task: k3d
     
   test:
     vars:
diff --git a/setup/docker/opsfile.yml b/setup/docker/opsfile.yml
index bec266b..e54a3dd 100644
--- a/setup/docker/opsfile.yml
+++ b/setup/docker/opsfile.yml
@@ -67,7 +67,12 @@ tasks:
       --kubeconfig="$OPS_TMP/kubeconfig" 
       --wait=1m --name=nuvolaris 
       --config=_kind.yaml
-
+    - |
+      if test -z "$SKIP_PRELOAD_IMAGES"
+      then docker pull "$IMAGES_OPERATOR"
+        
+      fi
+ 
   ingress:
     silent: true
     cmds:
@@ -82,15 +87,22 @@ tasks:
       - python space.py
 
   preload:
-    silent: true
+    silent: false
     desc: preload the Apache OpenServerless images in docker to speed up the 
cluster creation
     ignore_errors: true
+    status:
+      - config SKIP_PRELOAD_IMAGES
     cmds:
     - |
-      for image in "$IMAGES_OPERATOR" "$IMAGES_CONTROLLER"  "$IMAGES_STREAMER"
+      for image in "$IMAGES_STREAMER" "$IMAGES_OPERATOR"  "$IMAGES_CONTROLLER" 
  
       do
-        docker pull "$image" 
-        kind load docker-image "$image" --name nuvolaris
+        docker pull "$image" --platform "linux/{{ARCH}}"
+        if ! kind load docker-image "$image" --name nuvolaris 
+        then 
+          echo "*** Cannot preload images. You can disable preload with ops 
-config SKIP_PRELOAD_IMAGES=1"
+          echo "*** Workaround on Docker Desktop: disable 'Use containerd for 
pulling and storing images' on General"
+          exit 1
+        fi
         docker rmi "$image"
       done
     - |
@@ -100,12 +112,11 @@ tasks:
       | "\(.prefix)/\(.name):\(.tag)"' <$OPS_ROOT/runtimes.json \
       | rg apache/openserverless-runtime \
       | while read -r image; do
-          docker pull "$image"
+          docker pull "$image" --platform "linux/{{ARCH}}"
           kind load docker-image "$image" --name nuvolaris
           docker rmi "$image"
         done
 
-
   clean-all:
     silent: true
     desc: remove all images and containers from docker
@@ -117,7 +128,6 @@ tasks:
     - docker system prune -af 
     - docker volume prune -af
     - docker system df
-    
 
   create:
     silent: true
@@ -125,7 +135,6 @@ tasks:
     cmds:
     - task: cluster
     - task: ingress
-    - task: preload
     - cp "$OPS_TMP/kubeconfig" "$OPS_TMP/kind.kubeconfig"
     status:
     - kind get clusters | rg nuvolaris
@@ -134,17 +143,8 @@ tasks:
     silent: true
     desc: destroy the Apache OpenServerless cluster in Docker
     cmds:
-    - |
-      if ! test -e "$OPS_TMP/kind.kubeconfig"; then
-        echo "ops kind kubeconfig not found"
-        exit 1
-      fi
-      if [ "$KUBECONFIG" = "$HOME/.kube/config" ]; then
-        echo "backup kube config"
-        cp ~/.kube/config ~/.kube/config.bak
-      fi
     - kind delete clusters nuvolaris
-    - rm "$KUBECONFIG" "$OPS_TMP/kind.kubeconfig"
+    - rm -f "$OPS_TMP/kubeconfig" "$OPS_TMP/kind.kubeconfig"
 
   kubeconfig:
     desc: export kubeconfig
diff --git a/setup/opsfile.yml b/setup/opsfile.yml
index 7858803..2d3b7ee 100644
--- a/setup/opsfile.yml
+++ b/setup/opsfile.yml
@@ -81,7 +81,6 @@ tasks:
     cmds:
     - exit 0
 
-
   mini:
     silent: true
     desc: install miniops
@@ -91,17 +90,18 @@ tasks:
       - |
         if curl -sL http://miniops.me >/dev/null 2>/dev/null
         then
-          if 
-          curl -sL http://miniops.me/api/info 2>/dev/null | jq  -r 
.description | rg OpenWhisk >/dev/null
+          if curl -sL http://miniops.me/api/info 2>/dev/null | jq  -r 
.description | rg OpenWhisk >/dev/null 2>/dev/null
           then
-            echo "Apache OpenServerless mini is already installed."
-            echo "Login with: ops ide login devel http://miniops.me";
-            echo "You can find the password in .ops/devel.password in your 
home directory"
-            echo "If it is unwanted, you can uninstall it with: ops setup 
docker delete"
+            echo "*** Apache OpenServerless mini is already installed."
+            echo "*** Login with: ops ide login devel http://miniops.me";
+            echo "*** You can find the password in .ops/devel.password in your 
home directory"
+            echo "*** You can can uninstall and restart with: ops setup docker 
delete"
           else
-            echo "Something is already running as a local webserver, please 
remove it before installing miniops."
+            if ! kind get clusters | rg nuvolaris
+            then echo "*** Something is already running as a local webserver, 
please remove it before installing miniops."
+                 exit 1
+            fi
           fi
-          false
         fi
       - $OPS setup docker check-space
       - $OPS config slim
@@ -125,7 +125,8 @@ tasks:
         then 
           task check-ports PORTS="{{ .PORTS }}"
         fi
-        {{.RUN}} $OPS setup docker create         
+        {{.RUN}} $OPS setup docker create 
+        {{.RUN}} $OPS setup docker preload        
         {{.RUN}} $OPS setup kubernetes create
         {{.RUN}} $OPS setup nuvolaris login
         config STATUS_LAST=devcluster

Reply via email to