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

….3.7

.gitignore

@@ -35,4 +35,5 @@ __debug_bin
 main
 github.com
 .all-contributorsrc
-dist
+dist
+CasaOS

.goreleaser.debug.yaml

@@ -0,0 +1,167 @@
+# This is an example .goreleaser.yml file with some sensible defaults.
+# Make sure to check the documentation at https://goreleaser.com
+project_name: casaos
+before:
+  hooks:
+    # You may remove this if you don't use go modules.
+    - go mod tidy
+builds:
+  - id: casaos-amd64
+    binary: build/sysroot/usr/bin/casaos
+    env:
+      - CGO_ENABLED=1
+      - CC=x86_64-linux-gnu-gcc
+    gcflags:
+      - all=-N -l
+    ldflags:
+      - -extldflags "-static"
+    tags:
+      - musl
+      - netgo
+    goos:
+      - linux
+    goarch:
+      - amd64
+    hooks:
+      post:
+        - find build/sysroot -type f | xargs -L 1 realpath --relative-to=build/sysroot > build/sysroot.manifest
+  - id: casaos-arm64
+    binary: build/sysroot/usr/bin/casaos
+    env:
+      - CGO_ENABLED=1
+      - CC=aarch64-linux-gnu-gcc
+    gcflags:
+      - all=-N -l
+    ldflags:
+      - -extldflags "-static"
+    tags:
+      - musl
+      - netgo
+    goos:
+      - linux
+    goarch:
+      - arm64
+    hooks:
+      post:
+        - find build/sysroot -type f | xargs -L 1 realpath --relative-to=build/sysroot > build/sysroot.manifest
+  - id: casaos-arm-7
+    binary: build/sysroot/usr/bin/casaos
+    env:
+      - CGO_ENABLED=1
+      - CC=arm-linux-gnueabihf-gcc
+    gcflags:
+      - all=-N -l
+    ldflags:
+      - -extldflags "-static"
+    tags:
+      - musl
+      - netgo
+    goos:
+      - linux
+    goarch:
+      - arm
+    goarm:
+      - "7"
+    hooks:
+      post:
+        - find build/sysroot -type f | xargs -L 1 realpath --relative-to=build/sysroot > build/sysroot.manifest
+  - id: casaos-migration-tool-amd64
+    binary: build/sysroot/usr/bin/casaos-migration-tool
+    main: ./cmd/migration-tool
+    env:
+      - CGO_ENABLED=1
+      - CC=x86_64-linux-gnu-gcc
+    gcflags:
+      - all=-N -l
+    ldflags:
+      - -extldflags "-static"
+    tags:
+      - musl
+      - netgo
+    goos:
+      - linux
+    goarch:
+      - amd64
+  - id: casaos-migration-tool-arm64
+    binary: build/sysroot/usr/bin/casaos-migration-tool
+    main: ./cmd/migration-tool
+    env:
+      - CGO_ENABLED=1
+      - CC=aarch64-linux-gnu-gcc
+    gcflags:
+      - all=-N -l
+    ldflags:
+      - -extldflags "-static"
+    tags:
+      - musl
+      - netgo
+    goos:
+      - linux
+    goarch:
+      - arm64
+  - id: casaos-migration-tool-arm-7
+    binary: build/sysroot/usr/bin/casaos-migration-tool
+    main: ./cmd/migration-tool
+    env:
+      - CGO_ENABLED=1
+      - CC=arm-linux-gnueabihf-gcc
+    gcflags:
+      - all=-N -l
+    ldflags:
+      - -extldflags "-static"
+    tags:
+      - musl
+      - netgo
+    goos:
+      - linux
+    goarch:
+      - arm
+    goarm:
+      - "7"
+archives:
+  - name_template: "{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-v{{ .Version }}"
+    id: casaos
+    builds:
+      - casaos-amd64
+      - casaos-arm64
+      - casaos-arm-7
+    replacements:
+      arm: arm-7
+    files:
+      - build/**/*
+  - name_template: "{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-migration-tool-v{{ .Version }}"
+    id: casaos-migration-tool
+    builds:
+      - casaos-migration-tool-amd64
+      - casaos-migration-tool-arm64
+      - casaos-migration-tool-arm-7
+    replacements:
+      arm: arm-7
+    files:
+      - build/sysroot/etc/**/*
+checksum:
+  name_template: "checksums.txt"
+snapshot:
+  name_template: "{{ incpatch .Version }}"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"
+# release:
+#   github:
+#     owner: IceWhaleTech
+#     name: CasaOS
+#   draft: true
+#   prerelease: auto
+#   mode: replace
+#   name_template: "v{{ .Version }}"
+release:
+  github:
+    owner: IceWhaleTech
+    name: CasaOS
+  draft: true
+  prerelease: auto
+  mode: replace
+  name_template: "v{{ .Version }}"

.goreleaser.yaml

@@ -117,7 +117,7 @@ builds:
     goarch:
       - arm
     goarm:
-      - "7"    
+      - "7"
 archives:
   - name_template: "{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-v{{ .Version }}"
     id: casaos
@@ -159,9 +159,9 @@ changelog:
 #   name_template: "v{{ .Version }}"
 release:
   github:
-    owner: LinkLeong
-    name: casaos-alpha
+    owner: IceWhaleTech
+    name: CasaOS
   draft: true
   prerelease: auto
   mode: replace
-  name_template: "v{{ .Version }}"
+  name_template: "v{{ .Version }}"

build/scripts/migration/script.d/03-migrate-casaos.sh

@@ -60,8 +60,6 @@ BUILD_PATH=$(dirname "${BASH_SOURCE[0]}")/../../..
 SOURCE_ROOT=${BUILD_PATH}/sysroot
 
 APP_NAME="casaos"
-# APP_NAME_FORMAL="CasaOS"
-APP_NAME_FORMAL="casaos-alpha"
 
 # check if migration is needed
 SOURCE_BIN_PATH=${SOURCE_ROOT}/usr/bin
@@ -85,6 +83,25 @@ if [ "${NEED_MIGRATION}" = "false" ]; then
     exit 0
 fi
 
+ARCH="unknown"
+
+case $(uname -m) in
+    x86_64)
+        ARCH="amd64"
+        ;;
+    aarch64)
+        ARCH="arm64"
+        ;;
+    armv7l)
+        ARCH="arm-7"
+        ;;
+    *)
+        __error "Unsupported architecture"
+        ;;
+esac
+
+__info "ARCH: ${ARCH}"
+
 MIGRATION_SERVICE_DIR=${1}
 
 if [ -z "${MIGRATION_SERVICE_DIR}" ]; then
@@ -95,10 +112,10 @@ MIGRATION_PATH=()
 
 CURRENT_VERSION_FOUND="false"
 
-# a VERSION_PAIR looks like "v0.3.5 v0.3.6-alpha2"
+# a VERSION_PAIR looks like "v0.3.5 <url>"
 #
 # - "v0.3.5" is the current version installed on this host
-# - "v0.3.6-alpha2" is the version of the migration tool from GitHub
+# - "<url>" is the url of the migration tool
 while read -r VERSION_PAIR; do
     if [ -z "${VERSION_PAIR}" ]; then
         continue
@@ -107,15 +124,15 @@ while read -r VERSION_PAIR; do
     # obtain "v0.3.5" from "v0.3.5 v0.3.6-alpha2"
     VER1=$(echo "${VERSION_PAIR}" | cut -d' ' -f1)
 
-    # obtain "v0.3.6-alpha2" from "v0.3.5 v0.3.6-alpha2"
-    VER2=$(echo "${VERSION_PAIR}" | cut -d' ' -f2)
+    # obtain "<url>" from "v0.3.5 <url>"
+    URL=$(eval echo "${VERSION_PAIR}" | cut -d' ' -f2)
 
     if [ "${CURRENT_VERSION}" = "${VER1// /}" ] || [ "${CURRENT_VERSION}" = "LEGACY_WITHOUT_VERSION" ]; then
         CURRENT_VERSION_FOUND="true"
     fi
 
     if [ "${CURRENT_VERSION_FOUND}" = "true" ]; then
-        MIGRATION_PATH+=("${VER2// /}")
+        MIGRATION_PATH+=("${URL// /}")
     fi
 done < "${MIGRATION_LIST_FILE}"
 
@@ -124,47 +141,27 @@ if [ ${#MIGRATION_PATH[@]} -eq 0 ]; then
     exit 0
 fi
 
-ARCH="unknown"
-
-case $(uname -m) in
-    x86_64)
-        ARCH="amd64"
-        ;;
-    aarch64)
-        ARCH="arm64"
-        ;;
-    armv7l)
-        ARCH="arm-7"
-        ;;
-    *)
-        __error "Unsupported architecture"
-        ;;
-esac
-
 pushd "${MIGRATION_SERVICE_DIR}"
 
-{ for VER2 in "${MIGRATION_PATH[@]}"; do
-
-
-        MIGRATION_TOOL_FILE=linux-"${ARCH}"-"${APP_NAME}"-migration-tool-"${VER2}".tar.gz
+{ for URL in "${MIGRATION_PATH[@]}"; do
+        MIGRATION_TOOL_FILE=$(basename "${URL}")
 
         if [ -f "${MIGRATION_TOOL_FILE}" ]; then
             __info "Migration tool ${MIGRATION_TOOL_FILE} exists. Skip downloading."
             continue
         fi
 
-        MIGRATION_TOOL_URL=https://github.com/LinkLeong/"${APP_NAME_FORMAL}"/releases/download/"${VER2}"/linux-"${ARCH}"-"${APP_NAME}"-migration-tool-"${VER2}".tar.gz
-        echo "Dowloading ${MIGRATION_TOOL_URL}..."
-        curl -sL -O "${MIGRATION_TOOL_URL}"
+        __info "Dowloading ${URL}..."
+        curl -fsSL -o "${MIGRATION_TOOL_FILE}" -O "${URL}"
     done
 } || {
     popd
     __error "Failed to download migration tools"
 }
 
 {
-    for VER2 in "${MIGRATION_PATH[@]}"; do
-        MIGRATION_TOOL_FILE=linux-"${ARCH}"-"${APP_NAME}"-migration-tool-"${VER2}".tar.gz
+    for URL in "${MIGRATION_PATH[@]}"; do
+        MIGRATION_TOOL_FILE=$(basename "${URL}")
         __info "Extracting ${MIGRATION_TOOL_FILE}..."
         tar zxvf "${MIGRATION_TOOL_FILE}" || __error "Failed to extract ${MIGRATION_TOOL_FILE}"
 

build/scripts/migration/service.d/casaos/migration.list

@@ -1,4 +1,3 @@
-LEGACY_WITHOUT_VERSION v0.3.6
-v0.3.5 v0.3.6
-v0.3.5.1 v0.3.6
-v0.3.6 v0.3.7
+LEGACY_WITHOUT_VERSION https://github.com/IceWhaleTech/CasaOS/releases/download/v0.3.6/linux-${ARCH}-casaos-migration-tool-v0.3.6.tar.gz
+v0.3.5 https://github.com/IceWhaleTech/CasaOS/releases/download/v0.3.6/linux-${ARCH}-casaos-migration-tool-v0.3.6.tar.gz
+v0.3.5.1 https://github.com/IceWhaleTech/CasaOS/releases/download/v0.3.6/linux-${ARCH}-casaos-migration-tool-v0.3.6.tar.gz

build/scripts/setup/service.d/casaos/debian/setup-casaos.sh

@@ -31,15 +31,10 @@ if [ ! -f "${CONF_FILE}" ]; then
     cp -v "${CONF_FILE_SAMPLE}" "${CONF_FILE}"
 fi
 
-if systemctl is-active "${APP_NAME}.service" &>/dev/null ;then
-    echo "server started"
-else
-    # enable and start service
-    systemctl daemon-reload
-
-    echo "Enabling service..."
-    systemctl enable --force --no-ask-password "${APP_NAME}.service"
-
-    echo "Starting service..."
-    systemctl start --force --no-ask-password "${APP_NAME}.service"
-fi
+rm -rf /etc/systemd/system/casaos.service # remove old service file
+
+systemctl daemon-reload
+
+# enable service (without starting)
+echo "Enabling service..."
+systemctl enable --force --no-ask-password "${APP_NAME}.service"

build/sysroot/etc/casaos/casaos.conf.sample

@@ -11,7 +11,6 @@ DateFormat = 2006-01-02
 DBPath     = /var/lib/casaos
 ShellPath  = /usr/share/casaos/shell
 UserDataPath = /var/lib/casaos/conf
-TempPath    = /var/lib/casaos/temp
 
 [server]
 RunMode = release

build/sysroot/usr/lib/systemd/system/casaos.service

@@ -1,12 +1,13 @@
 [Unit]
 After=casaos-gateway.service
 ConditionFileNotEmpty=/etc/casaos/casaos.conf
-Description=CasaOS Service
+Description=CasaOS Main Service
 
 [Service]
 ExecStart=/usr/bin/casaos -c /etc/casaos/casaos.conf
 PIDFile=/var/run/casaos/casaos.pid
 Restart=always
+Type=notify
 
 [Install]
 WantedBy=multi-user.target

build/sysroot/usr/share/casaos/shell/update.sh

@@ -9,4 +9,4 @@
 ### 
 
 
-curl -fsSL https://raw.githubusercontent.com/LinkLeong/casaos-alpha/main/new.update.sh | bash
+curl -fsSL https://raw.githubusercontent.com/IceWhaleTech/get/main/update.sh | bash