diff --git a/.github/workflows/cloud.yml b/.github/workflows/cloud.yml index 9b74f53c71ac..e04caec2cb69 100644 --- a/.github/workflows/cloud.yml +++ b/.github/workflows/cloud.yml @@ -11,10 +11,15 @@ on: type: boolean default: false push_image_tag: - description: 'Push image tag' + description: 'Push all-in-one image tag, default is dev' default: 'dev' required: false type: string + build_from: + description: 'Build all-in-one image from components image tag, default is nightly' + default: 'nightly' + required: false + type: string push: branches: [ "main" ] paths: @@ -85,6 +90,7 @@ jobs: - name: Build sealos cloud cluster image working-directory: deploy/cloud run: | + sed -i "s#nightly#${{ inputs.build_from }}#g" init.sh sudo bash init.sh sudo sealos build -t ${{ steps.prepare.outputs.repo }}:${{ steps.prepare.outputs.tag_name }} -f Kubefile sudo sealos push ${{ steps.prepare.outputs.repo }}:${{ steps.prepare.outputs.tag_name }} diff --git a/deploy/cloud/init.sh b/deploy/cloud/init.sh index 27abc16a931c..6d628ee41fa6 100644 --- a/deploy/cloud/init.sh +++ b/deploy/cloud/init.sh @@ -1,18 +1,18 @@ #!/bin/bash mkdir -p tars -sealos pull ghcr.io/labring/sealos-cloud-user-controller:dev -sealos pull ghcr.io/labring/sealos-cloud-terminal-controller:dev -sealos pull ghcr.io/labring/sealos-cloud-app-controller:dev -sealos pull ghcr.io/labring/sealos-cloud-desktop-frontend:dev -sealos pull ghcr.io/labring/sealos-cloud-terminal-frontend:dev -sealos pull ghcr.io/labring/sealos-cloud-applaunchpad-frontend:dev +sealos pull ghcr.io/labring/sealos-cloud-user-controller:nightly +sealos pull ghcr.io/labring/sealos-cloud-terminal-controller:nightly +sealos pull ghcr.io/labring/sealos-cloud-app-controller:nightly +sealos pull ghcr.io/labring/sealos-cloud-desktop-frontend:nightly +sealos pull ghcr.io/labring/sealos-cloud-terminal-frontend:nightly +sealos pull ghcr.io/labring/sealos-cloud-applaunchpad-frontend:nightly -sealos save -o tars/user.tar ghcr.io/labring/sealos-cloud-user-controller:dev -sealos save -o tars/terminal.tar ghcr.io/labring/sealos-cloud-terminal-controller:dev -sealos save -o tars/app.tar ghcr.io/labring/sealos-cloud-app-controller:dev -sealos save -o tars/frontend-desktop.tar ghcr.io/labring/sealos-cloud-desktop-frontend:dev -sealos save -o tars/frontend-terminal.tar ghcr.io/labring/sealos-cloud-terminal-frontend:dev -sealos save -o tars/frontend-applaunchpad.tar ghcr.io/labring/sealos-cloud-applaunchpad-frontend:dev +sealos save -o tars/user.tar ghcr.io/labring/sealos-cloud-user-controller:nightly +sealos save -o tars/terminal.tar ghcr.io/labring/sealos-cloud-terminal-controller:nightly +sealos save -o tars/app.tar ghcr.io/labring/sealos-cloud-app-controller:nightly +sealos save -o tars/frontend-desktop.tar ghcr.io/labring/sealos-cloud-desktop-frontend:nightly +sealos save -o tars/frontend-terminal.tar ghcr.io/labring/sealos-cloud-terminal-frontend:nightly +sealos save -o tars/frontend-applaunchpad.tar ghcr.io/labring/sealos-cloud-applaunchpad-frontend:nightly diff --git a/deploy/cloud/scripts/init.sh b/deploy/cloud/scripts/init.sh index 2af75cc4adb2..61c499f80f48 100644 --- a/deploy/cloud/scripts/init.sh +++ b/deploy/cloud/scripts/init.sh @@ -25,15 +25,12 @@ function mock_tls { function sealos_run_controller { # run user controller sealos run tars/user.tar - # \ 1 > /dev/null # run terminal controller sealos run tars/terminal.tar --env cloudDomain=$cloudDomain --env userNamespace="user-system" --env wildcardCertSecretName="wildcard-cert" --env wildcardCertSecretNamespace="sealos-system" - # \ 1 > /dev/null # run app controller sealos run tars/app.tar - # \ 1 > /dev/null }