From cdbc3437be5477a64d99d6f6859b3da0702cc155 Mon Sep 17 00:00:00 2001 From: John Guan Date: Tue, 14 Dec 2021 10:40:17 +0800 Subject: [PATCH 01/15] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index dbeb7c5..379fc54 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Pull Requests](https://img.shields.io/github/issues-pr/IceWhaleTech/CasaOS?color=162453&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/pulls) [![Issues](https://img.shields.io/github/issues/IceWhaleTech/CasaOS?color=162453&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/issues) [![GitHub Stars](https://img.shields.io/github/stars/IceWhaleTech/CasaOS?color=162453&logo=github&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/stargazers) -[![Discord](https://img.shields.io/discord/884667213326463016?color=162453&label=Chat&logo=discord&logoColor=fff&style=flat-square)](https://discord.gg/Gx4BCEtHjx) +[![Discord](https://img.shields.io/discord/884667213326463016?color=162453&label=Chat&logo=discord&logoColor=fff&style=flat-square)](https://discord.gg/TZjYGnAW3M) CasaOS is an open-source Home Cloud system based on the Docker ecosystem and designed for home scenarios. It is committed to building the world's most simple, easy-to-use, and elegant Home Cloud system. @@ -19,7 +19,7 @@ IceWhale team believes that through community-driven collaborative innovation an > ⚠️ Note: > -> CasaOS is still in the early development stage and may vary significantly with the final release. Feel free to test run and share your feedback in the [Discord server](https://discord.gg/Gx4BCEtHjx)! +> CasaOS is still in the early development stage and may vary significantly with the final release. Feel free to test run and share your feedback in the [Discord server](https://discord.gg/TZjYGnAW3M)! ### Quick Setup CasaOS @@ -71,9 +71,9 @@ After looking at many systems and software on the market, the team found no serv So, we set out to build this open source project to develop CasaOS with our own hands, everyone in the community, and you. -> A warm welcome for you to share and discuss your great ideas in the [Discord server](https://discord.gg/Gx4BCEtHjx)! +> A warm welcome for you to share and discuss your great ideas in the [Discord server](https://discord.gg/TZjYGnAW3M)! -[![Discord Card](https://discordapp.com/api/guilds/884667213326463016/widget.png?style=banner2)](https://discord.gg/Gx4BCEtHjx) +[![Discord Card](https://discordapp.com/api/guilds/884667213326463016/widget.png?style=banner2)](https://discord.gg/TZjYGnAW3M) From bdcbae69a5063ba5d272275145bb44e67e902874 Mon Sep 17 00:00:00 2001 From: John Guan Date: Tue, 14 Dec 2021 11:41:42 +0800 Subject: [PATCH 02/15] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 379fc54..31b6ce4 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Pull Requests](https://img.shields.io/github/issues-pr/IceWhaleTech/CasaOS?color=162453&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/pulls) [![Issues](https://img.shields.io/github/issues/IceWhaleTech/CasaOS?color=162453&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/issues) [![GitHub Stars](https://img.shields.io/github/stars/IceWhaleTech/CasaOS?color=162453&logo=github&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/stargazers) -[![Discord](https://img.shields.io/discord/884667213326463016?color=162453&label=Chat&logo=discord&logoColor=fff&style=flat-square)](https://discord.gg/TZjYGnAW3M) +[![Discord](https://img.shields.io/discord/884667213326463016?color=162453&label=Chat&logo=discord&logoColor=fff&style=flat-square)](https://discord.gg/knqAbbBbeX) CasaOS is an open-source Home Cloud system based on the Docker ecosystem and designed for home scenarios. It is committed to building the world's most simple, easy-to-use, and elegant Home Cloud system. @@ -19,7 +19,7 @@ IceWhale team believes that through community-driven collaborative innovation an > ⚠️ Note: > -> CasaOS is still in the early development stage and may vary significantly with the final release. Feel free to test run and share your feedback in the [Discord server](https://discord.gg/TZjYGnAW3M)! +> CasaOS is still in the early development stage and may vary significantly with the final release. Feel free to test run and share your feedback in the [Discord server](https://discord.gg/knqAbbBbeX)! ### Quick Setup CasaOS @@ -71,9 +71,9 @@ After looking at many systems and software on the market, the team found no serv So, we set out to build this open source project to develop CasaOS with our own hands, everyone in the community, and you. -> A warm welcome for you to share and discuss your great ideas in the [Discord server](https://discord.gg/TZjYGnAW3M)! +> A warm welcome for you to share and discuss your great ideas in the [Discord server](https://discord.gg/knqAbbBbeX)! -[![Discord Card](https://discordapp.com/api/guilds/884667213326463016/widget.png?style=banner2)](https://discord.gg/TZjYGnAW3M) +[![Discord Card](https://discordapp.com/api/guilds/884667213326463016/widget.png?style=banner2)](https://discord.gg/knqAbbBbeX) From 27a011e7152be018271c45dce834f3257baca67a Mon Sep 17 00:00:00 2001 From: John Guan Date: Thu, 30 Dec 2021 18:01:01 +0800 Subject: [PATCH 03/15] Update casa.yml --- .github/workflows/casa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/casa.yml b/.github/workflows/casa.yml index d901ff1..4930140 100644 --- a/.github/workflows/casa.yml +++ b/.github/workflows/casa.yml @@ -31,7 +31,7 @@ jobs: matrix: go_version: - 1.17.1 - runs-on: Ubuntu 20.04 + runs-on: ubuntu-20.04 steps: # - name: Get release From 2b95c07a47621592fd5361b487ad776e26422edb Mon Sep 17 00:00:00 2001 From: John Guan Date: Thu, 30 Dec 2021 18:16:19 +0800 Subject: [PATCH 04/15] Update casa.yml --- .github/workflows/casa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/casa.yml b/.github/workflows/casa.yml index 4930140..ef58692 100644 --- a/.github/workflows/casa.yml +++ b/.github/workflows/casa.yml @@ -31,7 +31,7 @@ jobs: matrix: go_version: - 1.17.1 - runs-on: ubuntu-20.04 + runs-on: ubuntu-18.04 steps: # - name: Get release From ae35a6d29147b94b13c9f1a66bc5a1363a12cb92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E7=AB=AD=E5=8A=9B?= Date: Thu, 30 Dec 2021 18:44:07 +0800 Subject: [PATCH 05/15] Update casa.yml --- .github/workflows/casa.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/casa.yml b/.github/workflows/casa.yml index ef58692..0736142 100644 --- a/.github/workflows/casa.yml +++ b/.github/workflows/casa.yml @@ -31,7 +31,7 @@ jobs: matrix: go_version: - 1.17.1 - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: # - name: Get release @@ -76,6 +76,16 @@ jobs: uses: actions/setup-node@v2 with: node-version: '14' + + - name: Compile glibc + run: | + wget http://ftp.gnu.org/gnu/glibc/glibc-2.30.tar.gz + mkdir /opt/glibc230 + tar xvfj glibc-2.30.tar.bz2 + cd glibc-2.30 + ./glibc-2.30/configure --prefix=/opt/glibc230 --enable-cet + make + make install - name: Build frontend with nodejs and yarn run: | @@ -98,7 +108,7 @@ jobs: v: true x: false race: false - ldflags: -s -w + ldflags: -s -w -L /opt/glibc230/lib -extldflags "-static" buildmode: default # # - name: List Files From 505af8d10158b7aba07f4cd4035ba8911f2737bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E7=AB=AD=E5=8A=9B?= Date: Thu, 30 Dec 2021 18:46:17 +0800 Subject: [PATCH 06/15] Update casa.yml --- .github/workflows/casa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/casa.yml b/.github/workflows/casa.yml index 0736142..5aaab9e 100644 --- a/.github/workflows/casa.yml +++ b/.github/workflows/casa.yml @@ -79,7 +79,7 @@ jobs: - name: Compile glibc run: | - wget http://ftp.gnu.org/gnu/glibc/glibc-2.30.tar.gz + wget http://ftp.gnu.org/gnu/glibc/glibc-2.30.tar.bz2 mkdir /opt/glibc230 tar xvfj glibc-2.30.tar.bz2 cd glibc-2.30 From b80b08ef07a814e8e5ffb87ddbb3007b3a5098ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E7=AB=AD=E5=8A=9B?= Date: Thu, 30 Dec 2021 18:50:45 +0800 Subject: [PATCH 07/15] Update casa.yml --- .github/workflows/casa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/casa.yml b/.github/workflows/casa.yml index 5aaab9e..a8cbc88 100644 --- a/.github/workflows/casa.yml +++ b/.github/workflows/casa.yml @@ -79,7 +79,7 @@ jobs: - name: Compile glibc run: | - wget http://ftp.gnu.org/gnu/glibc/glibc-2.30.tar.bz2 + wget -q http://ftp.gnu.org/gnu/glibc/glibc-2.30.tar.bz2 mkdir /opt/glibc230 tar xvfj glibc-2.30.tar.bz2 cd glibc-2.30 From 3ea9fc0de0ed65c3dc055246bf231c476450d1f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E7=AB=AD=E5=8A=9B?= Date: Thu, 30 Dec 2021 18:52:37 +0800 Subject: [PATCH 08/15] Update casa.yml --- .github/workflows/casa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/casa.yml b/.github/workflows/casa.yml index a8cbc88..d17adc6 100644 --- a/.github/workflows/casa.yml +++ b/.github/workflows/casa.yml @@ -83,7 +83,7 @@ jobs: mkdir /opt/glibc230 tar xvfj glibc-2.30.tar.bz2 cd glibc-2.30 - ./glibc-2.30/configure --prefix=/opt/glibc230 --enable-cet + ./glibc-2.30/configure --prefix=/opt/glibc230 make make install From 20c240a1239b7fdd3af6bddce443008bd4b7a624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E7=AB=AD=E5=8A=9B?= Date: Thu, 30 Dec 2021 19:00:11 +0800 Subject: [PATCH 09/15] Update casa.yml --- .github/workflows/casa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/casa.yml b/.github/workflows/casa.yml index d17adc6..6500eaf 100644 --- a/.github/workflows/casa.yml +++ b/.github/workflows/casa.yml @@ -83,7 +83,7 @@ jobs: mkdir /opt/glibc230 tar xvfj glibc-2.30.tar.bz2 cd glibc-2.30 - ./glibc-2.30/configure --prefix=/opt/glibc230 + ./configure --prefix=/opt/glibc230 make make install From 6e39fe5f8c7617b73eaa517aaccadee00a4486ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E7=AB=AD=E5=8A=9B?= Date: Thu, 30 Dec 2021 19:04:37 +0800 Subject: [PATCH 10/15] Update casa.yml --- .github/workflows/casa.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/casa.yml b/.github/workflows/casa.yml index 6500eaf..b7b58cc 100644 --- a/.github/workflows/casa.yml +++ b/.github/workflows/casa.yml @@ -83,7 +83,9 @@ jobs: mkdir /opt/glibc230 tar xvfj glibc-2.30.tar.bz2 cd glibc-2.30 - ./configure --prefix=/opt/glibc230 + mkdir build + cd build + ../configure --prefix=/opt/glibc230 make make install From 3fc00f8da7fd0af55c5fbbd47a9b8ac393cb6fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E7=AB=AD=E5=8A=9B?= Date: Thu, 30 Dec 2021 19:13:40 +0800 Subject: [PATCH 11/15] Update casa.yml --- .github/workflows/casa.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/casa.yml b/.github/workflows/casa.yml index b7b58cc..3c4debe 100644 --- a/.github/workflows/casa.yml +++ b/.github/workflows/casa.yml @@ -85,8 +85,8 @@ jobs: cd glibc-2.30 mkdir build cd build - ../configure --prefix=/opt/glibc230 - make + ../configure --prefix=/opt/glibc230 --enable-cet + make -j$(($(nproc) + 1)) make install - name: Build frontend with nodejs and yarn From b377af1d24f4f284947ac44377c641c68992b5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E7=AB=AD=E5=8A=9B?= Date: Thu, 30 Dec 2021 19:17:11 +0800 Subject: [PATCH 12/15] Update casa.yml --- .github/workflows/casa.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/casa.yml b/.github/workflows/casa.yml index 3c4debe..9e28766 100644 --- a/.github/workflows/casa.yml +++ b/.github/workflows/casa.yml @@ -77,18 +77,6 @@ jobs: with: node-version: '14' - - name: Compile glibc - run: | - wget -q http://ftp.gnu.org/gnu/glibc/glibc-2.30.tar.bz2 - mkdir /opt/glibc230 - tar xvfj glibc-2.30.tar.bz2 - cd glibc-2.30 - mkdir build - cd build - ../configure --prefix=/opt/glibc230 --enable-cet - make -j$(($(nproc) + 1)) - make install - - name: Build frontend with nodejs and yarn run: | cd UI @@ -110,7 +98,7 @@ jobs: v: true x: false race: false - ldflags: -s -w -L /opt/glibc230/lib -extldflags "-static" + ldflags: -s -w -extldflags "-static" buildmode: default # # - name: List Files From 4a6fc9a9458fe45947ae1d81be434c6a4f3bcd75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E7=AB=AD=E5=8A=9B?= Date: Tue, 4 Jan 2022 14:47:46 +0800 Subject: [PATCH 13/15] Update system.go --- types/system.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/system.go b/types/system.go index fc30d4d..6c47eea 100644 --- a/types/system.go +++ b/types/system.go @@ -1,4 +1,4 @@ package types -const CURRENTVERSION = "0.2.4" +const CURRENTVERSION = "0.2.5" const BODY = "
  • New App Store
  • Fix minor bugs
    • " From 601e7ce10bd4a3ccfdbe44d494f252fb11cc5a7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E7=AB=AD=E5=8A=9B?= Date: Tue, 4 Jan 2022 14:51:09 +0800 Subject: [PATCH 14/15] Update casa.yml --- .github/workflows/casa.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/casa.yml b/.github/workflows/casa.yml index 9e28766..c32dde3 100644 --- a/.github/workflows/casa.yml +++ b/.github/workflows/casa.yml @@ -63,7 +63,17 @@ jobs: # git clone $REPO_URL -b $REPO_BRANCH --recursive casa # ln -sf /workdir/casa $GITHUB_WORKSPACE/casa # ls - + + - name: Compile glibc + run: | + wget -q http://ftp.gnu.org/gnu/glibc/glibc-2.30.tar.bz2 + sudo mkdir /opt/glibc230 + tar xvfj glibc-2.30.tar.bz2 + mkdir build + cd build + ../glibc-2.30/configure --prefix=/opt/glibc230 --enable-cet + sudo make -j$(($(nproc) + 1)) + sudo make install - name: Set enviroment for github-release run: | @@ -98,7 +108,7 @@ jobs: v: true x: false race: false - ldflags: -s -w -extldflags "-static" + ldflags: -s -w -L /opt/glibc230/lib -extldflags "-static" buildmode: default # # - name: List Files From 489a61712609dcb54caad54c82740606e7177d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E7=AB=AD=E5=8A=9B?= Date: Tue, 4 Jan 2022 16:22:38 +0800 Subject: [PATCH 15/15] Update casa.yml --- .github/workflows/casa.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/casa.yml b/.github/workflows/casa.yml index c32dde3..72b0145 100644 --- a/.github/workflows/casa.yml +++ b/.github/workflows/casa.yml @@ -64,16 +64,6 @@ jobs: # ln -sf /workdir/casa $GITHUB_WORKSPACE/casa # ls - - name: Compile glibc - run: | - wget -q http://ftp.gnu.org/gnu/glibc/glibc-2.30.tar.bz2 - sudo mkdir /opt/glibc230 - tar xvfj glibc-2.30.tar.bz2 - mkdir build - cd build - ../glibc-2.30/configure --prefix=/opt/glibc230 --enable-cet - sudo make -j$(($(nproc) + 1)) - sudo make install - name: Set enviroment for github-release run: | @@ -100,7 +90,7 @@ jobs: - name: Build with xgo uses: crazy-max/ghaction-xgo@v1 with: - xgo_version: latest + xgo_version: v0.7.5 go_version: ${{ matrix.go_version }} dest: build prefix: casa @@ -108,7 +98,7 @@ jobs: v: true x: false race: false - ldflags: -s -w -L /opt/glibc230/lib -extldflags "-static" + ldflags: -s -w buildmode: default # # - name: List Files