devbox-offline

deploy/devbox/Kubefile

@@ -7,5 +7,8 @@ COPY registry registry
 
 ENV cloudDomain=${cloudDomain:-"127.0.0.1.nip.io"}
 ENV cloudPort=""
+ENV registryAddr=${registryAddr:-"sealos.hub:5000"}
+ENV registryUser=${registryUser:-"admin"}
+ENV registryPassword=${registryPassword:-"passw0rd"}
 
 CMD ["bash scripts/init.sh"]

deploy/devbox/init.sh

@@ -5,26 +5,8 @@ set -e
 mkdir -p tars
 
 RetryPullImageInterval=3
-RetryPullFileInterval=3
 RetrySleepSeconds=3
 
-retryPullFile() {
-  local file=$1
-  local retry=0
-  local retryMax=3
-  set +e
-      while [ $retry -lt $RetryPullFileInterval ]; do
-          curl $file --create-dirs -o ./etc/minio-binaries/mc >/dev/null && break
-          retry=$(($retry + 1))
-          echo "retry pull file $file, retry times: $retry"
-          sleep $RetrySleepSeconds
-      done
-      set -e
-      if [ $retry -eq $retryMax ]; then
-          echo "pull file $file failed"
-          exit 1
-      fi
-}
 
 retryPullImage() {
     local image=$1

deploy/devbox/scripts/init.sh

@@ -1,3 +1,6 @@
 #!/bin/bash
 
 set -e
+
+sealos run tars/devbox-controller.tar -e cloudDomain=${cloudDomain} -e cloudPort=${cloudPort} -e registryAddr=${registryAddr} -e registryUser=${registryUser} -e registryPassword=${registryPassword}
+sealos run tars/devbox-frontend.tar -e cloudDomain=${cloudDomain} -e cloudPort=${cloudPort}

frontend/providers/devbox/deploy/Kubefile

@@ -8,12 +8,6 @@ COPY manifests manifests
 ENV cloudDomain="127.0.0.1.nip.io"
 ENV cloudPort=""
 ENV certSecretName="wildcard-cert"
-ENV monitorUrl="http://database-monitor.sealos.svc.cluster.local:9090"
-ENV minioUrl=""
-ENV minioAccessKey=""
-ENV minioSecretKey=""
-ENV minioPort=""
-ENV migrateFileImage=""
-ENV minioBucketName=""
+ENV registryAddr="sealos.hub:5000"
 
 CMD ["kubectl apply -f manifests"]

frontend/providers/devbox/deploy/manifests/deploy.yaml.tmpl

@@ -38,17 +38,17 @@ spec:
         - name: devbox-frontend
           env:
             - name: SEALOS_DOMAIN
-              value: { { .cloudDomain } }
+              value: {{ .cloudDomain }}
             - name: INGRESS_SECRET
               value: wildcard-cert
             - name: REGISTRY_ADDR
-              value: hub.{{ .cloudDomain }}{{ if .cloudPort }}:{{ .cloudPort }}{{ end }}
+              value: {{ .registryAddr }}
             - name: DEVBOX_AFFINITY_ENABLE
               value: 'true'
             - name: MONITOR_URL
               value: http://launchpad-monitor.sealos.svc.cluster.local:8428
             - name: SQUASH_ENABLE
-              value: 'true'
+              value: 'false'
             - name: ACCOUNT_URL
               value: http://account-service.account-system.svc.cluster.local:2333
           securityContext:
@@ -63,7 +63,7 @@ spec:
               cpu: 2000m
               memory: 2048Mi
             requests:
-              cpu: 10m
+              cpu: 100m
               memory: 128Mi
           # do not modify this image, it is used for CI/CD
           image: ghcr.io/labring/sealos-devbox-frontend:latest