Merge branch 'v0.3.7' of https://github.com/IceWhaleTech/CasaOS into v0.3.7

.github/workflows/demo.yml

@@ -33,7 +33,7 @@ jobs:
           
       - name: Get old instance and snapshot name, create new instance name
         run: | 
-          echo "OLD_INSTANCE_SNAPSHOT_NAME=$(aws lightsail get-instance-snapshots | grep '"name": "casaos-0.3.6-1666150291' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV
+          echo "OLD_INSTANCE_SNAPSHOT_NAME=$(aws lightsail get-instance-snapshots | grep '"name": "0.3.3-demo-1658402149' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV
           echo "OLD_INSTANCE_NAME=$(aws lightsail get-instances | grep '"name": "CasaOS-Demo-[0-9]' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV
           echo "NEW_INSTANCE_NAME=CasaOS-Demo-$(date +%s)" >> $GITHUB_ENV
           

.github/workflows/release.yml

@@ -28,10 +28,6 @@ jobs:
       -
         name: Fetch all tags
         run: git fetch --force --tags
-        
-      - name: Get version
-        id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
       -
         name: Set up Go
         uses: actions/setup-go@v2
@@ -49,18 +45,3 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' distribution
           # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
-      
-      - name: Upload to oss
-        id: upload_to_oss
-        uses: tvrcgo/upload-to-oss@master
-        with:
-          key-id: ${{ secrets.OSS_KEY_ID }}
-          key-secret: ${{ secrets.OSS_KEY_SECRET }}
-          region: oss-cn-shanghai
-          bucket: casaos
-          assets: |
-            dist/checksums.txt:/IceWhaleTech/CasaOS/releases/download/${{ steps.get_version.outputs.VERSION }}/checksums.txt
-            dist/linux-arm-7-casaos-${{ steps.get_version.outputs.VERSION }}.tar.gz:/IceWhaleTech/CasaOS/releases/download/${{ steps.get_version.outputs.VERSION }}/linux-arm-7-casaos-${{ steps.get_version.outputs.VERSION }}.tar.gz
-            dist/linux-arm64-casaos-${{ steps.get_version.outputs.VERSION }}.tar.gz:/IceWhaleTech/CasaOS/releases/download/${{ steps.get_version.outputs.VERSION }}/linux-arm64-casaos-${{ steps.get_version.outputs.VERSION }}.tar.gz
-            dist/linux-amd64-casaos-${{ steps.get_version.outputs.VERSION }}.tar.gz:/IceWhaleTech/CasaOS/releases/download/${{ steps.get_version.outputs.VERSION }}/linux-amd64-casaos-${{ steps.get_version.outputs.VERSION }}.tar.gz
-

CHANGELOG.md

@@ -18,34 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-## [0.3.7]
 
-### Added
-- [Storage] Disk merge (Beta), you can merge multiple disks into a single storage space (currently you need to enable this feature from the command line)
-
-### Changed
-- [Files] Changed the cache file storage location, now the file upload size is not limited by the system disk capacity.
-- [Scripts] Updated installation and upgrade scripts to support more Debian-based Linux distributions.
-- [Engineering] Refactored Local Storage into a standalone service as part of CasaOS modularization.
-
-### Fixed
-- [Apps] App list update mechanism improved, now you can see the latest apps in App Store immediately.
-- [Storage] Fixed a lot of known issues
-
-### Added
-- [Storage] Disk merge (Beta), you can merge multiple disks into a single storage space (currently you need to enable this feature from the command line)
-
-### Changed
-- [Files] Changed the cache file storage location, now the file upload size is not limited by the system disk capacity.
-- [Scripts] Updated installation and upgrade scripts to support more Debian-based Linux distributions.
-- [Engineering] Refactored Local Storage into a standalone service as part of CasaOS modularization.
-
-### Fixed
-- [Apps] App list update mechanism improved, now you can see the latest apps in App Store immediately.
-- [Storage] Fixed a lot of known issues
-
-
-## [0.3.6] - 2022-09-06
+## [0.3.6-alpha.1] - 2022-09-06
 
 ###  Added
 - [System] Added power and temperature info to performance widget (Intel)

build/scripts/setup/script.d/03-setup-casaos.sh

@@ -45,7 +45,7 @@ SETUP_SCRIPT_FILEPATH="${SETUP_SCRIPT_DIRECTORY}/${SETUP_SCRIPT_FILENAME}"
 
 {
     echo "🟩 Running ${SETUP_SCRIPT_FILENAME}..."
-    $BASH "${SETUP_SCRIPT_FILEPATH}" "${BUILD_PATH}"
+    $SHELL "${SETUP_SCRIPT_FILEPATH}" "${BUILD_PATH}"
 } || {
     echo "🟥 ${SETUP_SCRIPT_FILENAME} failed."
     exit 1

build/sysroot/usr/share/casaos/cleanup/script.d/03-cleanup-casaos.sh

@@ -1,47 +0,0 @@
-#!/bin/bash
-
-set -e
-
-readonly APP_NAME_SHORT=casaos
-
-__get_setup_script_directory_by_os_release() {
-	pushd "$(dirname "${BASH_SOURCE[0]}")/../service.d/${APP_NAME_SHORT}" &>/dev/null
-
-	{
-		# shellcheck source=/dev/null
-		{
-			source /etc/os-release
-			{
-				pushd "${ID}"/"${VERSION_CODENAME}" &>/dev/null
-			} || {
-				pushd "${ID}" &>/dev/null
-			} || {
-				pushd "${ID_LIKE}" &>/dev/null
-			} || {
-				echo "Unsupported OS: ${ID} ${VERSION_CODENAME} (${ID_LIKE})"
-				exit 1
-			}
-
-			pwd
-
-			popd &>/dev/null
-
-		} || {
-			echo "Unsupported OS: unknown"
-			exit 1
-		}
-
-	}
-
-	popd &>/dev/null
-}
-
-SETUP_SCRIPT_DIRECTORY=$(__get_setup_script_directory_by_os_release)
-
-readonly SETUP_SCRIPT_DIRECTORY
-readonly SETUP_SCRIPT_FILENAME="cleanup-${APP_NAME_SHORT}.sh"
-readonly SETUP_SCRIPT_FILEPATH="${SETUP_SCRIPT_DIRECTORY}/${SETUP_SCRIPT_FILENAME}"
-
-echo "🟩 Running ${SETUP_SCRIPT_FILENAME}..."
-$SHELL "${SETUP_SCRIPT_FILEPATH}" "${BUILD_PATH}"
-

build/sysroot/usr/share/casaos/cleanup/service.d/casaos/debian/bullseye/cleanup-casaos.sh

@@ -1 +0,0 @@
-../cleanup-casaos.sh

build/sysroot/usr/share/casaos/cleanup/service.d/casaos/debian/cleanup-casaos.sh

@@ -1,204 +0,0 @@
-#!/bin/bash
-
-set -e
-
-readonly CASA_SERVICES=(
-    "casaos.service"
-    "devmon@devmon.service"
-)
-
-readonly CASA_EXEC=casaos
-readonly CASA_CONF=/etc/casaos/casaos.conf
-readonly CASA_URL=/var/run/casaos/casaos.url
-readonly CASA_SERVICE_USR=/usr/lib/systemd/system/casaos.service
-readonly CASA_SERVICE_LIB=/lib/systemd/system/casaos.service
-readonly CASA_SERVICE_ETC=/etc/systemd/system/casaos.service
-
-# Old Casa Files
-readonly CASA_PATH=/casaOS
-readonly CASA_CONF_PATH_OLD=/etc/casaos.conf
-
-readonly aCOLOUR=(
-    '\e[38;5;154m' # green  	| Lines, bullets and separators
-    '\e[1m'        # Bold white	| Main descriptions
-    '\e[90m'       # Grey		| Credits
-    '\e[91m'       # Red		| Update notifications Alert
-    '\e[33m'       # Yellow		| Emphasis
-)
-
-Show() {
-    # OK
-    if (($1 == 0)); then
-        echo -e "${aCOLOUR[2]}[$COLOUR_RESET${aCOLOUR[0]}  OK  $COLOUR_RESET${aCOLOUR[2]}]$COLOUR_RESET $2"
-    # FAILED
-    elif (($1 == 1)); then
-        echo -e "${aCOLOUR[2]}[$COLOUR_RESET${aCOLOUR[3]}FAILED$COLOUR_RESET${aCOLOUR[2]}]$COLOUR_RESET $2"
-    # INFO
-    elif (($1 == 2)); then
-        echo -e "${aCOLOUR[2]}[$COLOUR_RESET${aCOLOUR[0]} INFO $COLOUR_RESET${aCOLOUR[2]}]$COLOUR_RESET $2"
-    # NOTICE
-    elif (($1 == 3)); then
-        echo -e "${aCOLOUR[2]}[$COLOUR_RESET${aCOLOUR[4]}NOTICE$COLOUR_RESET${aCOLOUR[2]}]$COLOUR_RESET $2"
-    fi
-}
-
-Warn() {
-    echo -e "${aCOLOUR[3]}$1$COLOUR_RESET"
-}
-
-trap 'onCtrlC' INT
-onCtrlC() {
-    echo -e "${COLOUR_RESET}"
-    exit 1
-}
-
-Detecting_CasaOS() {
-    if [[ ! -x "$(command -v ${CASA_EXEC})" ]]; then
-        Show 2 "CasaOS is not detected, exit the script."
-        exit 1
-    else
-        Show 0 "This script will delete the containers you no longer use, and the CasaOS configuration files."
-    fi
-}
-
-Uninstall_Container() {
-    if [[ ${UNINSTALL_ALL_CONTAINER} == true && "$(docker ps -aq)" != "" ]]; then
-        Show 2 "Start deleting containers."
-        docker stop "$(docker ps -aq)" || Show 1 "Failed to stop all containers."
-        docker rm "$(docker ps -aq)" || Show 1 "Failed to delete all containers."
-    fi
-}
-
-Remove_Images() {
-    if [[ ${REMOVE_IMAGES} == "all" && "$(docker images -q)" != "" ]]; then
-        Show 2 "Start deleting all images."
-        docker rmi "$(docker images -q)" || Show 1 "Failed to delete all images."
-    elif [[ ${REMOVE_IMAGES} == "unuse" && "$(docker images -q)" != "" ]]; then
-        Show 2 "Start deleting unuse images."
-        docker image prune -af || Show 1 "Failed to delete unuse images."
-    fi
-}
-
-
-Uninstall_Casaos() {
-
-    for SERVICE in "${CASA_SERVICES[@]}"; do
-        Show 2 "Stopping ${SERVICE}..."
-        systemctl disable --now "${SERVICE}" || Show 3 "Failed to disable ${SERVICE}"
-    done
-
-    # Remove Service file
-    if [[ -f ${CASA_SERVICE_USR} ]]; then
-        rm -rvf ${CASA_SERVICE_USR}
-    fi
-
-    if [[ -f ${CASA_SERVICE_LIB} ]]; then
-        rm -rvf ${CASA_SERVICE_LIB}
-    fi
-
-    if [[ -f ${CASA_SERVICE_ETC} ]]; then
-        rm -rvf ${CASA_SERVICE_ETC}
-    fi
-
-    # Old Casa Files
-    if [[ -d ${CASA_PATH} ]]; then
-        rm -rvf ${CASA_PATH} || Show 1 "Failed to delete legacy CasaOS files."
-    fi
-
-    if [[ -f ${CASA_CONF_PATH_OLD} ]]; then
-        rm -rvf ${CASA_CONF_PATH_OLD}
-    fi
-
-    # New Casa Files
-    if [[ ${REMOVE_APP_DATA} = true ]]; then
-        rm -rvf /DATA/AppData || Show 1 "Failed to delete AppData."
-    fi
-
-    rm -rvf "$(which ${CASA_EXEC})" || Show 3 "Failed to remove ${CASA_EXEC}"
-    rm -rvf ${CASA_CONF} || Show 3 "Failed to remove ${CASA_CONF}"
-    rm -rvf ${CASA_URL} || Show 3 "Failed to remove ${CASA_URL}"
-
-    rm -rvf /var/lib/casaos/app_category.json
-    rm -rvf /var/lib/casaos/app_list.json
-    rm -rvf /var/lib/casaos/docker_root
-}
-
-Detecting_CasaOS
-
-while true; do
-    echo -n -e "         ${aCOLOUR[4]}Do you want delete all containers? Y/n :${COLOUR_RESET}"
-    read -r input
-    case $input in
-    [yY][eE][sS] | [yY])
-        UNINSTALL_ALL_CONTAINER=true
-        break
-        ;;
-    [nN][oO] | [nN])
-        UNINSTALL_ALL_CONTAINER=false
-        break
-        ;;
-    *)
-        Warn "         Invalid input..."
-        ;;
-    esac
-done
-
-if [[ ${UNINSTALL_ALL_CONTAINER} == true ]]; then
-    while true; do
-        echo -n -e "         ${aCOLOUR[4]}Do you want delete all images? Y/n :${COLOUR_RESET}"
-        read -r input
-        case $input in
-        [yY][eE][sS] | [yY])
-            REMOVE_IMAGES="all"
-            break
-            ;;
-        [nN][oO] | [nN])
-            REMOVE_IMAGES="none"
-            break
-            ;;
-        *)
-            Warn "         Invalid input..."
-            ;;
-        esac
-    done
-
-    while true; do
-        echo -n -e "         ${aCOLOUR[4]}Do you want delete all AppData of CasaOS? Y/n :${COLOUR_RESET}"
-        read -r input
-        case $input in
-        [yY][eE][sS] | [yY])
-            REMOVE_APP_DATA=true
-            break
-            ;;
-        [nN][oO] | [nN])
-            REMOVE_APP_DATA=false
-            break
-            ;;
-        *)
-            Warn "         Invalid input..."
-            ;;
-        esac
-    done
-else
-    while true; do
-        echo -n -e "         ${aCOLOUR[4]}Do you want to delete all images that are not used by the container? Y/n :${COLOUR_RESET}"
-        read -r input
-        case $input in
-        [yY][eE][sS] | [yY])
-            REMOVE_IMAGES="unuse"
-            break
-            ;;
-        [nN][oO] | [nN])
-            REMOVE_IMAGES="none"
-            break
-            ;;
-        *)
-            Warn "         Invalid input..."
-            ;;
-        esac
-    done
-fi
-
-Uninstall_Container
-Remove_Images
-Uninstall_Casaos

build/sysroot/usr/share/casaos/cleanup/service.d/casaos/ubuntu/cleanup-casaos.sh

@@ -1 +0,0 @@
-../debian/cleanup-casaos.sh

build/sysroot/usr/share/casaos/cleanup/service.d/casaos/ubuntu/jammy/cleanup-casaos.sh

@@ -1 +0,0 @@
-../../debian/bullseye/cleanup-casaos.sh