22 Commits

Author SHA1 Message Date
5e302a8c69 Update: change logs
All checks were successful
AntOS pipeline / build-amd64 (push) Successful in 4m49s
AntOS pipeline / build-arm64 (push) Successful in 4m48s
AntOS pipeline / build-arm (push) Successful in 4m26s
AntOS pipeline / publish-doc-on-tag (push) Has been skipped
AntOS pipeline / publish-package-on-tag (push) Has been skipped
2024-07-29 10:57:29 +02:00
aafe706cc8 feat(2.1.5): GridView allows navigation by arrow keys
All checks were successful
AntOS pipeline / build-amd64 (push) Successful in 4m15s
AntOS pipeline / build-arm64 (push) Successful in 4m22s
AntOS pipeline / publish-doc-on-tag (push) Has been skipped
AntOS pipeline / build-arm (push) Successful in 3m27s
AntOS pipeline / publish-package-on-tag (push) Has been skipped
2024-07-28 19:06:33 +02:00
51a59685ea feat(ListView): allow item navigation using keyboard (arrow keys)
Some checks failed
AntOS pipeline / build-amd64 (push) Failing after 27s
AntOS pipeline / build-arm64 (push) Failing after 27s
AntOS pipeline / publish-doc-on-tag (push) Has been skipped
AntOS pipeline / build-arm (push) Failing after 26s
AntOS pipeline / publish-package-on-tag (push) Has been skipped
2024-07-28 13:01:21 +02:00
af33b62624 improve(frontend): allow changing year in calendar widget
All checks were successful
AntOS pipeline / build-amd64 (push) Successful in 4m11s
AntOS pipeline / build-arm64 (push) Successful in 4m32s
AntOS pipeline / publish-doc-on-tag (push) Has been skipped
AntOS pipeline / build-arm (push) Successful in 3m36s
AntOS pipeline / publish-package-on-tag (push) Has been skipped
2024-07-27 12:01:42 +02:00
930277ee24 fix(silk): security - database file shall be created with 0600 mode
All checks were successful
AntOS pipeline / build-amd64 (push) Successful in 4m14s
AntOS pipeline / build-arm64 (push) Successful in 4m21s
AntOS pipeline / build-arm (push) Successful in 4m23s
AntOS pipeline / publish-doc-on-tag (push) Has been skipped
AntOS pipeline / publish-package-on-tag (push) Has been skipped
2024-07-27 01:02:07 +02:00
736141a4be fix(ci): build front-end before doc and sdk
All checks were successful
AntOS pipeline / build-amd64 (push) Successful in 4m15s
AntOS pipeline / build-arm64 (push) Successful in 4m26s
AntOS pipeline / build-arm (push) Successful in 4m29s
AntOS pipeline / publish-doc-on-tag (push) Has been skipped
AntOS pipeline / publish-package-on-tag (push) Has been skipped
2024-07-25 23:57:50 +02:00
0a2b701037 fix(ci): missing submodules
Some checks failed
AntOS pipeline / build-arm (push) Has been cancelled
AntOS pipeline / publish-doc-on-tag (push) Has been cancelled
AntOS pipeline / publish-package-on-tag (push) Has been cancelled
AntOS pipeline / build-amd64 (push) Has been cancelled
AntOS pipeline / build-arm64 (push) Has been cancelled
2024-07-25 23:39:11 +02:00
274f959ae2 feat(ci): publishing doc on tagging
All checks were successful
AntOS pipeline / build-arm64 (push) Successful in 5m44s
AntOS pipeline / build-amd64 (push) Successful in 5m47s
AntOS pipeline / build-arm (push) Successful in 5m44s
AntOS pipeline / publish-doc-on-tag (push) Has been skipped
AntOS pipeline / publish-package-on-tag (push) Has been skipped
2024-07-25 23:24:46 +02:00
76dc81a8a4 fix: docker permission
All checks were successful
AntOS pipeline / build-amd64 (push) Successful in 4m13s
AntOS pipeline / build-arm64 (push) Successful in 4m20s
AntOS pipeline / build-arm (push) Successful in 4m23s
AntOS pipeline / publish-on-tag (push) Has been skipped
2024-07-25 21:27:56 +02:00
c738ebf998 update(ci): remove existing package version before uploading new one
All checks were successful
AntOS pipeline / build-amd64 (push) Successful in 4m19s
AntOS pipeline / build-arm64 (push) Successful in 4m22s
AntOS pipeline / build-arm (push) Successful in 3m34s
AntOS pipeline / publish-on-tag (push) Has been skipped
2024-07-25 21:16:37 +02:00
6c3ab28d88 bump to version 2.1.1
All checks were successful
AntOS pipeline / build-amd64 (push) Successful in 4m12s
AntOS pipeline / build-arm64 (push) Successful in 4m23s
AntOS pipeline / build-arm (push) Successful in 3m28s
AntOS pipeline / publish-on-tag (push) Has been skipped
2024-07-24 23:59:50 +02:00
6e24cd89f2 feat(ci): add step to check binaries after build
All checks were successful
AntOS pipeline / build-amd64 (push) Successful in 4m16s
AntOS pipeline / build-arm64 (push) Successful in 4m21s
AntOS pipeline / build-arm (push) Successful in 3m31s
AntOS pipeline / publish-on-tag (push) Has been skipped
2024-07-24 23:42:44 +02:00
69f7995c02 feat(ci): use gitea action instead of jenkins
All checks were successful
AntOS pipeline / build-amd64 (push) Successful in 4m18s
AntOS pipeline / build-arm (push) Successful in 4m5s
AntOS pipeline / build-arm64 (push) Successful in 4m47s
AntOS pipeline / publish-on-tag (push) Has been skipped
2024-07-24 19:54:32 +02:00
4dd34b5e79 Use latest front-end 2024-07-24 19:54:32 +02:00
74bd054321 update doc 2024-07-24 19:54:32 +02:00
a8b278dae5 fix: cross toolchain install for docker dev image 2024-07-21 18:56:15 +02:00
3a5e06216d front-end: fix PushNotification bug
All checks were successful
gitea-sync/antos/pipeline/head This commit looks good
gitea-sync/antos/pipeline/tag This commit looks good
2024-04-30 16:35:26 +02:00
b0e51d5a52 ci: export build file to public release
All checks were successful
gitea-sync/antos/pipeline/head This commit looks good
gitea-sync/antos/pipeline/tag This commit looks good
2024-04-29 11:00:41 +02:00
3df1bb4729 Update README.md
All checks were successful
gitea-sync/antos/pipeline/head This commit looks good
2024-04-28 11:45:39 +02:00
d9f63e1833 fix(antos-frontend): add missing Setting handle to git
All checks were successful
gitea-sync/antos/pipeline/head This commit looks good
gitea-sync/antos/pipeline/tag This commit looks good
2024-03-21 13:17:33 +01:00
753fa8937f feat(frontend): Setting displays versions info
All checks were successful
gitea-sync/antos/pipeline/tag This commit looks good
gitea-sync/antos/pipeline/head This commit looks good
2024-03-18 17:07:58 +01:00
5d9bae6172 feat: allow to query all components version in frontend + improve backend security
All checks were successful
gitea-sync/antos/pipeline/head This commit looks good
gitea-sync/antos/pipeline/tag This commit looks good
2024-03-17 21:30:35 +01:00
16 changed files with 406 additions and 215 deletions

View File

@ -0,0 +1,33 @@
name: Building AntOS binaries
on:
workflow_call:
inputs:
platform:
required: true
type: string
jobs:
build:
runs-on: ci-tools
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Update submodule
run: git submodule update --init
- name: Building binaries for platform - ${{ inputs.platform }}
run: |
mkdir build
DESTDIR=$(realpath build) \
ARCH=${{ inputs.platform }} \
RUSTUP_HOME=/opt/rust/rustup \
CARGO_HOME=/opt/rust/cargo \
make all deb appimg
- name: Checking binaries
run: ./scripts/ckarch.sh build
- name: Save artifact
uses: actions/upload-artifact@v3
with:
name: build-${{ inputs.platform }}
path: build/
retention-days: 5
- run: echo "Build is ${{ job.status }}."

93
.gitea/workflows/ci.yml Normal file
View File

@ -0,0 +1,93 @@
name: AntOS pipeline
run-name: Building AntOS binaries
on: [push]
jobs:
build-amd64:
uses: ./.gitea/workflows/build-bin.yml
with:
platform: amd64
build-arm64:
uses: ./.gitea/workflows/build-bin.yml
with:
platform: arm64
build-arm:
uses: ./.gitea/workflows/build-bin.yml
with:
platform: arm
publish-doc-on-tag:
runs-on: act-runner
if: gitea.event_name == 'push' && contains(gitea.ref, 'refs/tags/')
needs:
container:
image: iohubdev/ci-tools:latest
volumes:
- /opt/public/antos-release/:/public/
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Update submodule
run: git submodule update --init
- run: mkdir -p build
- name: Build and publish doc and SDK
run: |
make frontend
DOCDIR=/public/doc/ make doc
SDKDIR=/public/sdk/ make sdk
publish-package-on-tag:
runs-on: act-runner
if: gitea.event_name == 'push' && contains(gitea.ref, 'refs/tags/')
needs: [build-amd64, build-arm64, build-arm]
container:
image: catthehacker/ubuntu:act-latest
steps:
- name: Check out repository code
uses: actions/checkout@v4
- run: mkdir -p build
- name: get build-amd64 artifacts
uses: actions/download-artifact@master
with:
name: build-amd64
path: build
- name: get build-arm64 artifacts
uses: actions/download-artifact@master
with:
name: build-arm64
path: build
- name: get build-arm artifacts
uses: actions/download-artifact@master
with:
name: build-arm
path: build
- name: Set up QEMU
uses: docker/setup-qemu-action@master
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@master
- name: Login to DockerHub
uses: docker/login-action@master
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PAT }}
- name: Env
run: |
printenv
docker info
ls . -al
ls build/ -al
- name: Build and push docker image
run: |
PKG_VERSION="${{ gitea.ref_name }}"
DOCKER_TAG=$PKG_VERSION DOCKER_IMAGE=iohubdev/antos make docker
- name: Publish packages
run: |
rm build/*/opt/ -rf
files=$(find ./build -type f)
PKG_VERSION="${{ gitea.ref_name }}"
URL="https://git.iohub.dev/api/packages/dany/generic/antos/$PKG_VERSION"
curl --request "DELETE" --header "Authorization: token ${{ secrets.GT_API_PAT }}" $URL/ || true
for file in $files; do
curl --header "Authorization: token ${{ secrets.GT_API_PAT }}" --upload-file $file $URL/$(basename $file)
done

View File

@ -29,7 +29,11 @@ Work in progress
git wget curl git wget curl
``` ```
Rust ### Rust
```sh
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
```
rustup default stable rustup default stable
Install cross toolchain Install cross toolchain
@ -52,7 +56,7 @@ libssl libsqlite3 zlib1g libreadline libvncclient1 libjpeg-turbo8
## Build ## Build
``` ```
git submodule update --init git submodule update --init
make CARGO_HOME=~/.cargo make
# build docker (WIP) # build docker (WIP)
make docker make docker

86
CHANGELOG.md Normal file
View File

@ -0,0 +1,86 @@
## AntOS change logs
* v2.1.4
- Frontend: ListView allows to navigate items using arrows keys
- Backend: GridView allows to navigate items using arrows keys
* v2.1.3
- Frontend: Calendar widget allows to change year
* v2.1.2
- Fix docker image file permission
- Improve security: backend create database file with 0600 mode
* v2.1.1
- Fix notification bugs
* v2.1.0
- improve backend security
- Add REST API to display version info
* v.2.0.0
- Work In Progress: The UI is redesigned to support mobile device
* V1.2.1
- 9b5da17 - App name now can differ from pkgname
- b381294 - fix: fix icon display problem when application is installed, remove all related settings when an application is uinstalled
- b6c90e5 - update image path in readme
- 14b72ef - Fix dragndrop bug on Fileview (grid mod)
- c96919e - fix: correct jenkins build demo stage
- 1cf7181 - Fix fileview status incorrect, add more build stage to Jenkinsfile
- 255f9dc - update readme file, and include it to delivery
- d08b33a - fix ar generation problem: with new version format
- da5bbda - Allow to set version number and build ID to the current Antos build
- 699c697 - update login form style
- 2fd4bb5 - Bug fix + improvement
- 6cbb463 - Fileview: list view display modified date instead of mime
- f7081ae - Include current Antos version to login screen
- 5d17c42 - Makefile read current version from gcode
- 583a0c0 - update version number in code
- c0603cd - Minor style fixes on menus and dropdown list
- 8b029c2 - fix minor visual bug on grid view, list view and tree view
- 86bcaf9 - visual bug fix on label: inline block by default
- 61de957 - Visual improvements
- 52af4b6 - fix visualize bug after style changes
- e63cae1 - style improvement on Label, FileView, GridView, system menu and app Panel
- f97a45b - Add more control to mem file + bug fix on File
- fdcc5ce - allow to create memory-based temporal VFS file system
- 81d78aa - robusify VFS mem file handling
- d109d6a - fix: file name display inconsitent between views
- c26e27d - Fix multiple dialogs focus bug
- 8b23ebe - Loading animation is now based on the current context (global or application context)
- 2cdd8f9 - support dnd and grid sort
- 079af3b - fix type conversion error in gridview tag
- a6d725e - User a custom tag to manage the desktop instead of GUI
- 0624f42 - API improvement & bug fix: - subscribed global event doesnt unsubcribed when process is killed - process killall API doesnt work as expected - improve core API
- 3a24df1 - update announcement system
- e345a61 - update bootstrap icons to v.1.7.1
- b3d38cc - allow multiple files upload in single request
- 66e96cc - update VFS API
- 86a94a8 - update GUI API
- 27ac7c0 - Minor bug fix on desktop handling
- 99e0d02 - enable setting blur overlay window
- 52709d5 - improve Window GUI API
- 9c06d88 - AntOS load automatically custom VFS handles if available
- c23cb1b - Improve core API: - improve OS exit API - improve VFS API
* V.1.2.0 Improvement GUI API
- [x] File dialog should remember last opened folder
- [x] Add dynamic key-value dialog that work on any object
- [x] Window list panel should show window title in tooltip when mouse hovering on application icon
- [x] Allow pinning application to system panel
- [x] Improvement application list in market place
- [x] Allow triplet keyboard shortcut in GUI
- [x] CodePad allows setting shortcut in CommandPalette commands
- [ ] Improvement multi-window application support
- [x] CodePad should have recent menu entry that remember top n file opened
- [x] Improve File application grid view
- [x] Label text should be selectable
- [x] switch window using shortcut
- [x] Loading bar animation on system pannel
- [x] Multiple file upload support
- [x] Generic key-value dialog
- [x] Add bootstrap font support for icons
- [x] Class applications by categories in start menu
- [x] Support vertical and horizontal resize window
- Market place now classifies application by categories
- CodePad is no longer default system application, it has been moved to MarketPlace
- More applications added to MarketPlace
- Antos SDK
- SDK is no longer included in base Antos release, it can be installed via MarketPlace
- The SDK now has a generic API that can be used in different development tasks other than AntOS application
- Heavy SDK tasks are now offloaded to workers
- Introduce new JSON based syntax for SDK task/target definition
- From this version, docker image of All-in-one AntOS system is available at: [https://hub.docker.com/r/xsangle/antosaio](https://hub.docker.com/r/xsangle/antosaio)

117
Jenkinsfile vendored
View File

@ -1,117 +0,0 @@
pipeline {
agent {
node { label'workstation' }
}
options {
// Limit build history with buildDiscarder option:
// daysToKeepStr: history is only kept up to this many days.
// numToKeepStr: only this many build logs are kept.
// artifactDaysToKeepStr: artifacts are only kept up to this many days.
// artifactNumToKeepStr: only this many builds have their artifacts kept.
buildDiscarder(logRotator(numToKeepStr: '1'))
// Enable timestamps in build log console
timestamps()
// Maximum time to run the whole pipeline before canceling it
timeout(time: 3, unit: 'HOURS')
// Use Jenkins ANSI Color Plugin for log console
ansiColor('xterm')
// Limit build concurrency to 1 per branch
disableConcurrentBuilds()
}
stages
{
stage('Prepare dependencies') {
steps {
sh'''
cd antd/luasocket && git stash || true
cd $WORKSPACE
git submodule update --init
make clean || true
rm -rf build/* || true
mkdir build || true
'''
}
}
stage('Build AMD64)') {
agent {
docker {
image 'xsangle/ci-tools:latest'
reuseNode true
args ' --device /dev/fuse --privileged '
}
}
steps {
sh'''
DESTDIR=$(realpath build) \
ARCH=amd64 \
RUSTUP_HOME=/opt/rust/rustup \
CARGO_HOME=/opt/rust/cargo \
make all deb appimg
'''
}
}
stage('Build ARM64)') {
agent {
docker {
image 'xsangle/ci-tools:latest'
reuseNode true
args ' --device /dev/fuse --privileged '
}
}
steps {
sh'''
DESTDIR=$(realpath build) \
ARCH=arm64 \
RUSTUP_HOME=/opt/rust/rustup \
CARGO_HOME=/opt/rust/cargo \
make all deb appimg
'''
}
}
stage('Build ARM)') {
agent {
docker {
image 'xsangle/ci-tools:latest'
reuseNode true
args ' --device /dev/fuse --privileged '
}
}
steps {
sh'''
DESTDIR=$(realpath build) \
ARCH=arm \
RUSTUP_HOME=/opt/rust/rustup \
CARGO_HOME=/opt/rust/cargo \
make all deb appimg
'''
}
}
stage('Checking build)') {
steps {
sh'''
./scripts/ckarch.sh build
'''
}
}
stage('Build docker') {
steps {
script {
if (env.TAG_NAME) {
sh'''
DOCKER_TAG=$TAG_NAME DOCKER_IMAGE=iohubdev/antos make docker
'''
} else {
echo "Regular commit doing nothing"
}
}
}
}
stage('Archive') {
steps {
script {
archiveArtifacts artifacts: 'build/', fingerprint: true
}
}
}
}
}

View File

@ -5,12 +5,14 @@ DOCKER_TAG?=$(subst master,stable,$(subst refs/heads/,,$(shell git symbolic-ref
DOCKER_IMAGE?=iohubdev/antos DOCKER_IMAGE?=iohubdev/antos
ARCH?=amd64 ARCH?=amd64
VERSION?=2.0.0-b VERSION?=2.1.5-b
RUSTUP_HOME?=/opt/rust RUSTUP_HOME?=/opt/rust
CARGO_HOME?=/opt/rust/cargo CARGO_HOME?=/opt/rust/cargo
BUILDDIR?=$(ROOT_DIR)/build/ BUILDDIR?=$(ROOT_DIR)/build/
DESTDIR?=/ DESTDIR?=/
DOCDIR?=$(ROOT_DIR)/build/doc/
SDKDIR?=$(ROOT_DIR)/build/sdk/
ifeq ('$(ARCH)','amd64') ifeq ('$(ARCH)','amd64')
RUST_TARGET?=x86_64-unknown-linux-gnu RUST_TARGET?=x86_64-unknown-linux-gnu
@ -44,6 +46,10 @@ all: antos tar.gz
antos: antd backend frontend antos: antd backend frontend
cp $(ROOT_DIR)/README.md $(INSTALL_DIR)/htdocs/os cp $(ROOT_DIR)/README.md $(INSTALL_DIR)/htdocs/os
touch $(INSTALL_DIR)/htdocs/os/packages/.DENIED
touch $(INSTALL_DIR)/htdocs/os/libs/.DENIED
touch $(INSTALL_DIR)/htdocs/os/controllers/.DENIED
scripts/version.sh $(INSTALL_DIR)/htdocs/os/libs
antd: httpd plugins luasec luasocket silk luafcgi antd: httpd plugins luasec luasocket silk luafcgi
rm $(INSTALL_DIR)/runner.ini rm $(INSTALL_DIR)/runner.ini
@ -181,6 +187,19 @@ appimg:
docker: docker:
scripts/mkdocker.sh $(DOCKER_IMAGE):$(DOCKER_TAG) scripts/mkdocker.sh $(DOCKER_IMAGE):$(DOCKER_TAG)
doc:
mkdir -p $(DOCDIR)/$(VERSION)
VERSION=$(VERSION) BUILDID=$(BUILDID) DOCDIR=$(DOCDIR)/$(VERSION) make -C antos-frontend doc
sdk:
mkdir -p $(SDKDIR)/$(VERSION)
cp antos-frontend/d.ts/* $(SDKDIR)/$(VERSION)
-rm $(SDKDIR)/versions.txt
@for file in $(SDKDIR)/*; do \
echo $$file; \
echo $$(basename $$file) >> $(SDKDIR)/versions.txt; \
done
# --push # --push
.PHONY: antd antos docker .PHONY: antd antos docker

View File

@ -1,5 +1,6 @@
# ![https://github.com/antos-rde/antos/raw/master/antos-64.png](https://github.com/antos-rde/antos/raw/master/antos-64.png) antOS v2.0.0 # ![https://github.com/antos-rde/antos/raw/master/antos-64.png](https://github.com/antos-rde/antos/raw/master/antos-64.png) antOS v2.x.x
[![Build Status](https://ci.iohub.dev/buildStatus/icon?job=gitea-sync%2Fantos%2F2.0.x)](https://ci.iohub.dev/buildStatus/icon?job=gitea-sync%2Fantos%2F2.0.x)
![https://git.iohub.dev/dany/antos/actions/workflows/ci.yml/badge.svg?branch=master](https://git.iohub.dev/dany/antos/actions/workflows/ci.yml/badge.svg?branch=master)
AntOS is a web-based remote desktop environment that provides an all-in-one solution for setting up a cloud-based, self-hosted working environment. It features a backend API and services, a front-end web-based window manager, application APIs, a GUI toolkit, and file system abstractions. It also includes an application store and an SDK for in-browser application development, deployment, and packaging. AntOS is designed to work across devices, including desktop computers and mobile devices. AntOS is a web-based remote desktop environment that provides an all-in-one solution for setting up a cloud-based, self-hosted working environment. It features a backend API and services, a front-end web-based window manager, application APIs, a GUI toolkit, and file system abstractions. It also includes an application store and an SDK for in-browser application development, deployment, and packaging. AntOS is designed to work across devices, including desktop computers and mobile devices.
@ -25,7 +26,7 @@ Github: [https://github.com/antos-rde](https://github.com/antos-rde)
A demo of the VDE is available at [https://app.iohub.dev/antos/](https://app.iohub.dev/antos/) using username: demo and password: demo. A demo of the VDE is available at [https://app.iohub.dev/antos/](https://app.iohub.dev/antos/) using username: demo and password: demo.
If one want to run AntOS VDE locally in their system, a docker image is available at: If one want to run AntOS VDE locally in their system, a docker image is available at:
[https://hub.docker.com/r/xsangle/antosaio](https://hub.docker.com/r/xsangle/antosaio) [https://hub.docker.com/r/iohubdev/antos](https://hub.docker.com/r/iohubdev/antos)
## Build and install ## Build and install
@ -37,80 +38,6 @@ See [BUILD.md](BUILD.md) for more information on project building and installing
## Front-end Documentation ## Front-end Documentation
- API: [https://doc.iohub.dev/antos/api/](https://doc.iohub.dev/antos/api/) - API: [https://doc.iohub.dev/antos/api/](https://doc.iohub.dev/antos/api/)
## Change logs
### v.2.0.0
- Work In Progress: The UI is redesigned to support mobile device
### V1.2.1
- 9b5da17 - App name now can differ from pkgname
- b381294 - fix: fix icon display problem when application is installed, remove all related settings when an application is uinstalled
- b6c90e5 - update image path in readme
- 14b72ef - Fix dragndrop bug on Fileview (grid mod)
- c96919e - fix: correct jenkins build demo stage
- 1cf7181 - Fix fileview status incorrect, add more build stage to Jenkinsfile
- 255f9dc - update readme file, and include it to delivery
- d08b33a - fix ar generation problem: with new version format
- da5bbda - Allow to set version number and build ID to the current Antos build
- 699c697 - update login form style
- 2fd4bb5 - Bug fix + improvement
- 6cbb463 - Fileview: list view display modified date instead of mime
- f7081ae - Include current Antos version to login screen
- 5d17c42 - Makefile read current version from gcode
- 583a0c0 - update version number in code
- c0603cd - Minor style fixes on menus and dropdown list
- 8b029c2 - fix minor visual bug on grid view, list view and tree view
- 86bcaf9 - visual bug fix on label: inline block by default
- 61de957 - Visual improvements
- 52af4b6 - fix visualize bug after style changes
- e63cae1 - style improvement on Label, FileView, GridView, system menu and app Panel
- f97a45b - Add more control to mem file + bug fix on File
- fdcc5ce - allow to create memory-based temporal VFS file system
- 81d78aa - robusify VFS mem file handling
- d109d6a - fix: file name display inconsitent between views
- c26e27d - Fix multiple dialogs focus bug
- 8b23ebe - Loading animation is now based on the current context (global or application context)
- 2cdd8f9 - support dnd and grid sort
- 079af3b - fix type conversion error in gridview tag
- a6d725e - User a custom tag to manage the desktop instead of GUI
- 0624f42 - API improvement & bug fix: - subscribed global event doesnt unsubcribed when process is killed - process killall API doesnt work as expected - improve core API
- 3a24df1 - update announcement system
- e345a61 - update bootstrap icons to v.1.7.1
- b3d38cc - allow multiple files upload in single request
- 66e96cc - update VFS API
- 86a94a8 - update GUI API
- 27ac7c0 - Minor bug fix on desktop handling
- 99e0d02 - enable setting blur overlay window
- 52709d5 - improve Window GUI API
- 9c06d88 - AntOS load automatically custom VFS handles if available
- c23cb1b - Improve core API: - improve OS exit API - improve VFS API
### V.1.2.0 Improvement GUI API
- [x] File dialog should remember last opened folder
- [x] Add dynamic key-value dialog that work on any object
- [x] Window list panel should show window title in tooltip when mouse hovering on application icon
- [x] Allow pinning application to system panel
- [x] Improvement application list in market place
- [x] Allow triplet keyboard shortcut in GUI
- [x] CodePad allows setting shortcut in CommandPalette commands
- [ ] Improvement multi-window application support
- [x] CodePad should have recent menu entry that remember top n file opened
- [x] Improve File application grid view
- [x] Label text should be selectable
- [x] switch window using shortcut
- [x] Loading bar animation on system pannel
- [x] Multiple file upload support
- [x] Generic key-value dialog
- [x] Add bootstrap font support for icons
- [x] Class applications by categories in start menu
- [x] Support vertical and horizontal resize window
* Market place now classifies application by categories
* CodePad is no longer default system application, it has been moved to MarketPlace
* More applications added to MarketPlace
* Antos SDK
- SDK is no longer included in base Antos release, it can be installed via MarketPlace
- The SDK now has a generic API that can be used in different development tasks other than AntOS application
- Heavy SDK tasks are now offloaded to workers
- Introduce new JSON based syntax for SDK task/target definition
* From this version, docker image of All-in-one AntOS system is available at: [https://hub.docker.com/r/xsangle/antosaio](https://hub.docker.com/r/xsangle/antosaio)
## Licence ## Licence
Copyright 2017-2022 Xuan Sang LE <mrsang AT iohub DOT dev> Copyright 2017-2022 Xuan Sang LE <mrsang AT iohub DOT dev>

View File

@ -65,6 +65,7 @@ COPY --from=deploy-env /platform/opt/ /opt/
COPY docker/antos/start.sh /start.sh COPY docker/antos/start.sh /start.sh
RUN chmod 700 /start.sh RUN chmod 700 /start.sh
RUN chmod +x /opt/www/bin/*
ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/www/lib/" ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/www/lib/"
ENV PATH="$PATH:/opt/www/bin/" ENV PATH="$PATH:/opt/www/bin/"

View File

@ -1,7 +1,4 @@
FROM debian:bookworm AS deploy-env FROM debian:bookworm AS deploy-env
ARG UNAME=ci
ARG UID=1000
ARG GID=1000
RUN apt-get update && apt-get --yes --no-install-recommends install \ RUN apt-get update && apt-get --yes --no-install-recommends install \
build-essential \ build-essential \
@ -19,11 +16,14 @@ RUN apt-get update && apt-get --yes --no-install-recommends install \
libffi-dev \ libffi-dev \
ca-certificates \ ca-certificates \
unzip \ unzip \
libturbojpeg0-dev \ libjpeg62-turbo-dev \
libvncserver-dev \ libvncserver-dev \
lua5.3 lua5.3
ENV RUSTUP_HOME=/opt/rust/rustup
ENV CARGO_HOME=/opt/rust/cargo
RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo bash -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y' RUN bash -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y'
RUN . /opt/rust/cargo/env && rustup default stable
RUN chmod -R 777 /opt/rust/ RUN chmod -R 777 /opt/rust/
RUN apt-get update && apt-get --yes --no-install-recommends install \ RUN apt-get update && apt-get --yes --no-install-recommends install \
nodejs npm git wget libfuse2 fuse3 nodejs npm git wget libfuse2 fuse3
@ -33,13 +33,17 @@ RUN dpkg --add-architecture armhf
RUN dpkg --add-architecture arm64 RUN dpkg --add-architecture arm64
RUN apt-get update && apt-get --yes --no-install-recommends install \ RUN apt-get update && apt-get --yes --no-install-recommends install \
crossbuild-essential-armhf \ crossbuild-essential-armhf \
crossbuild-essential-armhf \ crossbuild-essential-arm64 \
libsqlite3-0:arm64 zlib1g:arm64 libreadline8:arm64 libssl3:arm64 \ libsqlite3-dev:arm64 zlib1g-dev:arm64 libreadline-dev:arm64 libssl-dev:arm64 \
libffi-dev:arm64 libturbojpeg0:arm64 libvncclient1:arm64 \ libffi-dev:arm64 libjpeg62-turbo-dev:arm64 libvncclient1:arm64 \
libsqlite3-0:armhf zlib1g:armhf libreadline8:armhf libssl3:armhf \ libsqlite3-dev:armhf zlib1g-dev:armhf libreadline-dev:armhf libssl-dev:armhf \
libffi-dev:armhf libturbojpeg0:armhf libvncclient1:armhf libffi-dev:armhf libjpeg62-turbo-dev:armhf libvncclient1:armhf
RUN ln -sf /usr/lib/arm-linux-gnueabihf/libvncclient.so.1 /usr/lib/arm-linux-gnueabihf/libvncclient.so
RUN ln -sf /usr/lib/aarch64-linux-gnu/libvncclient.so.1 /usr/lib/aarch64-linux-gnu/libvncclient.so
#RUN ln -sf /usr/lib/arm-linux-gnueabihf/libjpeg.so.62 /usr/lib/arm-linux-gnueabihf/libjpeg.so
#RUN ln -sf /usr/lib/aarch64-linux-gnu/libjpeg.so.62 /usr/lib/aarch64-linux-gnu/libjpeg.so
RUN groupadd -g 1000 -o ci RUN groupadd -g 1000 -o ci
RUN useradd -m -u 1000 -g 1000 -o -s /bin/bash ci RUN useradd -m -u 1000 -g 1000 -o -s /bin/bash ci
USER ci USER ci
WORKDIR /home/ci WORKDIR /home/ci

View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
set -e set -e
set -x
DOCKER_IMAGE=$1 DOCKER_IMAGE=$1

140
scripts/version.sh Executable file
View File

@ -0,0 +1,140 @@
#! /bin/bash
get_version_lua_socket() {
file=$1
dir=$(dirname "$(realpath "$file")")
line=$(grep -e "^## \[.*" "$file" | head -1)
ref=$(cd "$dir" && git rev-parse --short HEAD )
regex="##\s+\[\s*v([0-9\.]+)\s*\].*"
name="luasocket"
if [[ $line =~ $regex ]]; then
version="${BASH_REMATCH[1]}"
echo " Project name: $name VERSION: $version REF: $ref"
cat << EOF >> /tmp/versions.json
"$name":
{
"version": "$version",
"ref": "$ref"
},
EOF
else
echo "Unable to find version on $file"
exit 1
fi
}
get_version_lua_sec() {
file=$1
dir=$(dirname "$(realpath "$file")")
line=$(grep -e "^LuaSec" $file | head -1)
ref=$(cd "$dir" && git rev-parse --short HEAD )
regex="LuaSec\s+([0-9\.]+).*"
name="luasec"
if [[ $line =~ $regex ]]; then
version="${BASH_REMATCH[1]}"
echo " Project name: $name VERSION: $version REF: $ref"
cat << EOF >> /tmp/versions.json
"$name":
{
"version": "$version",
"ref": "$ref"
},
EOF
else
echo "Unable to find version on $file"
exit 1
fi
}
get_version_rust() {
file=$1
dir=$(dirname "$(realpath "$file")")
line=$(grep -e "^version\s*=.*" "$file")
ref=$(cd "$dir" && git rev-parse --short HEAD )
regex="\s*version\s*=\s*\"([^\"]*)\".*"
if [[ $line =~ $regex ]]; then
version="${BASH_REMATCH[1]}"
else
echo "Unable to find version on $file"
exit 1
fi
line=$(grep -e "^name\s*=.*" "$file")
regex="\s*name\s*=\s*\"([^\"]*)\".*"
if [[ $line =~ $regex ]]; then
name="${BASH_REMATCH[1]}"
else
echo "Unable to find name on $file"
exit 1
fi
echo " Project name: $name VERSION: $version REF: $ref"
cat << EOF >> /tmp/versions.json
"$name":
{
"version": "$version",
"ref": "$ref"
},
EOF
}
get_version_autotool() {
file=$1
dir=$(dirname "$(realpath "$file")")
line="$(grep "AC_INIT" "$file")"
regex="\s*AC_INIT\s*\(\s*\[\s*([a-zA-Z0-9_\-]*)\s*\]\s*,\s*\[\s*([a-zA-Z0-9\._\-]*).*"
if [[ $line =~ $regex ]]; then
name="${BASH_REMATCH[1]}"
version="${BASH_REMATCH[2]}"
ref=$(cd "$dir" && git rev-parse --short HEAD )
echo " Project name: $name VERSION: $version REF: $ref"
cat << EOF >> /tmp/versions.json
"$name":
{
"version": "$version",
"ref": "$ref"
},
EOF
else
echo "Unable to find version on $file"
exit 1
fi
}
get_version() {
dir=$1
echo "getting version in $dir/configure.ac"
if [ -e "$dir/configure.ac" ]; then
get_version_autotool "$dir/configure.ac"
return 0
fi
if [ -e "$dir/Cargo.toml" ]; then
get_version_rust "$dir/Cargo.toml"
return 0
fi
if [ "$dir" = "antd/luasec" ]; then
get_version_lua_sec "$dir/CHANGELOG"
return 0
fi
if [ "$dir" = "antd/luasocket" ]; then
get_version_lua_socket "$dir/CHANGELOG.md"
return 0
fi
echo "Unknown version for project $dir"
exit 1
}
DESTDIR=$1
if [ -z "$DESTDIR" ]; then
echo "Please specify DESTDIR as parameter"
exit 1
fi
mkdir -p "$DESTDIR"
echo "{" > /tmp/versions.json
for prj in antd/* ; do
get_version "$prj"
done
sed -i '$ s/.$//' /tmp/versions.json
echo "}" >> /tmp/versions.json
install -m 0644 /tmp/versions.json "$DESTDIR"
echo "DONE"