Skip to content

Commit 911e35a

Browse files
author
PH
committed
updated casaos version
1 parent d5428fd commit 911e35a

File tree

8 files changed

+26
-25
lines changed

8 files changed

+26
-25
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[submodule "CasaOS"]
22
path = CasaOS
33
url = https://github.com/IceWhaleTech/CasaOS.git
4-
branch = v0.4.13
4+
branch = v0.4.15
55
update = checkout
66

77
[submodule "CasaOS-AppManagement"]

CasaOS-UI

Submodule CasaOS-UI updated 577 files

Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,20 +176,21 @@ COPY ./CasaOS-LocalStorage/build/sysroot/etc/casaos/local-storage.conf.sample /e
176176
############################################################################################################
177177
# Build the Go binary for the UI
178178
############################################################################################################
179-
FROM node:16 AS builder-casaos-ui
179+
FROM node:lts-slim AS builder-casaos-ui
180+
181+
ENV PNPM_HOME="/pnpm"
182+
ENV PATH="$PNPM_HOME:$PATH"
180183

181184
WORKDIR /app
185+
RUN corepack enable
182186

183187
COPY ./CasaOS-UI/package.json .
184-
COPY ./CasaOS-UI/yarn.lock .
185-
COPY ./CasaOS-UI/.yarnrc.yml .
186-
COPY ./CasaOS-UI/.yarn ./.yarn
187-
COPY ./CasaOS-UI/main/package.json ./main/package.json
188+
COPY ./CasaOS-UI/pnpm-lock.yaml .
188189

189-
RUN yarn install
190+
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
190191

191192
COPY ./CasaOS-UI .
192-
RUN yarn build
193+
RUN pnpm run build
193194

194195
############################################################################################################
195196
# Build the Go binary for the CasaOS Main
@@ -318,7 +319,7 @@ COPY ./conf/local-storage/local-storage.conf /etc/casaos/local-storage.conf
318319

319320
#COPY ui /var/lib/casaos/www and other initial files
320321
COPY --from=builder-casaos-ui /app/build/sysroot/var/lib/casaos/ /var/lib/casaos/
321-
COPY ./CasaOS-UI/main/register-ui-events.sh ./register-ui-events.sh
322+
COPY ./CasaOS-UI/register-ui-events.sh ./register-ui-events.sh
322323
RUN chmod +x ./register-ui-events.sh
323324

324325
# Copy CasaOS-AppStore

README.MD

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -170,17 +170,17 @@ npx dockflow build
170170

171171
This project integrates various CasaOS components as submodules. Each submodule is tracked at a specific version to ensure stability and compatibility.
172172

173-
| Component | Branch | Version | Upstream Repository |
174-
|-----------|---------|--------|-------------------|
175-
| CasaOS | main | v0.4.13 | [IceWhaleTech/CasaOS](https://github.com/IceWhaleTech/CasaOS) |
176-
| CasaOS-AppManagement | casa-img | | [IceWhaleTech/CasaOS-AppManagement](https://github.com/IceWhaleTech/CasaOS-AppManagement) |
177-
| CasaOS-AppStore | main | no version | [IceWhaleTech/CasaOS-AppStore](https://github.com/IceWhaleTech/CasaOS-AppStore) |
178-
| CasaOS-Gateway | main | v0.4.8 | [IceWhaleTech/CasaOS-Gateway](https://github.com/IceWhaleTech/CasaOS-Gateway) |
179-
| CasaOS-LocalStorage | main | v0.4.5-2 | [IceWhaleTech/CasaOS-LocalStorage](https://github.com/IceWhaleTech/CasaOS-LocalStorage) |
180-
| CasaOS-MessageBus | main | v0.4.5 | [IceWhaleTech/CasaOS-MessageBus](https://github.com/IceWhaleTech/CasaOS-MessageBus) |
181-
| CasaOS-UI | casa-img | | [IceWhaleTech/CasaOS-UI](https://github.com/IceWhaleTech/CasaOS-UI) |
182-
| CasaOS-UserService | casa-img | | [IceWhaleTech/CasaOS-UserService](https://github.com/IceWhaleTech/CasaOS-UserService) |
183-
| CasaOS-CLI | main | v0.4.4 | [IceWhaleTech/CasaOS-CLI](https://github.com/IceWhaleTech/CasaOS-CLI) |
173+
| Component | Branch | Version | Upstream Repository |
174+
|-----------|-------------------|----------------|-------------------|
175+
| CasaOS | main | v0.4.15 | [IceWhaleTech/CasaOS](https://github.com/IceWhaleTech/CasaOS) |
176+
| CasaOS-AppManagement | casa-img | v0.4.16-alpha2 | [IceWhaleTech/CasaOS-AppManagement](https://github.com/IceWhaleTech/CasaOS-AppManagement) |
177+
| CasaOS-AppStore | main | no version | [IceWhaleTech/CasaOS-AppStore](https://github.com/IceWhaleTech/CasaOS-AppStore) |
178+
| CasaOS-Gateway | main | v0.4.8 | [IceWhaleTech/CasaOS-Gateway](https://github.com/IceWhaleTech/CasaOS-Gateway) |
179+
| CasaOS-LocalStorage | main | v0.4.5-2 | [IceWhaleTech/CasaOS-LocalStorage](https://github.com/IceWhaleTech/CasaOS-LocalStorage) |
180+
| CasaOS-MessageBus | main | v0.4.5 | [IceWhaleTech/CasaOS-MessageBus](https://github.com/IceWhaleTech/CasaOS-MessageBus) |
181+
| CasaOS-UI | casa-img | 0.4.20 | [IceWhaleTech/CasaOS-UI](https://github.com/IceWhaleTech/CasaOS-UI) |
182+
| CasaOS-UserService | casa-img | v0.4.8 | [IceWhaleTech/CasaOS-UserService](https://github.com/IceWhaleTech/CasaOS-UserService) |
183+
| CasaOS-CLI | main | v0.4.4 | [IceWhaleTech/CasaOS-CLI](https://github.com/IceWhaleTech/CasaOS-CLI) |
184184
## Support
185185

186186
Need help? Join our Discord community: [https://discord.gg/QJyuNDXuFa](https://discord.gg/QJyuNDXuFa)

dockflow.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"registry": "nasselle",
33
"image": "casa-img",
4-
"version": "casaos-v0.4.13-v2"
4+
"version": "casaos-v0.4.15"
55
}

0 commit comments

Comments
 (0)