diff --git a/workspaces/base-workspace/Dockerfile b/workspaces/base-workspace/Dockerfile index 177e2ca..2e1c01b 100755 --- a/workspaces/base-workspace/Dockerfile +++ b/workspaces/base-workspace/Dockerfile @@ -37,7 +37,7 @@ RUN apt-get -y update \ && cd /opt/ungit && . env/bin/activate && npm install -g ungit@1.5.9 \ && echo "------------------------------------------------------ static file server" \ && mkdir -p /opt/serve \ - && cd /opt/serve && nodeenv --node=12.18.3 --npm=6.0.0 env \ + && cd /opt/serve && nodeenv --node=16.14.1 --npm=6.0.0 env \ && cd /opt/serve && . env/bin/activate && npm install -g serve \ && echo "------------------------------------------------------ mkdocs" \ && pip install -r /home/abc/installed-python-packages/mkdocs-requirements.txt \ diff --git a/workspaces/base-workspace/README.md b/workspaces/base-workspace/README.md index 9324756..e4ce0bf 100644 --- a/workspaces/base-workspace/README.md +++ b/workspaces/base-workspace/README.md @@ -3,8 +3,7 @@

# Base-workspace -Containerized Linux environment for running jobs on schedule with browser-based scheduler, terminal and file manager. -You can host on your favourite Rasberry Pi. +Containerized environment for running jobs on schedule with browser-based scheduler, terminal and file manager. ## Start @@ -29,12 +28,13 @@ open [localhost:8020](http://localhost:8020) in browser. - Python 3, Pip - Node/nodeenv - curl, wget, telnet, jq - - **Git:** git, git-flow, lazygit - - **File browsers:** mc, xplr + - **Git:** git, git-flow + - **File browsers:** mc - **Text editors:** nano, vim, mcedit - **System monitors:** ncdu, htop, glances, vizex - **Process Control:** supervisord - **Job scheduler:** cron + - **Terminal multiplexer:** tmux ## Why this image diff --git a/workspaces/base-workspace/mkdocs/docs/README.md b/workspaces/base-workspace/mkdocs/docs/README.md index 8fe2d9c..86b44ed 100644 --- a/workspaces/base-workspace/mkdocs/docs/README.md +++ b/workspaces/base-workspace/mkdocs/docs/README.md @@ -69,12 +69,6 @@ "image": "assets/home/Filebrowser.png", "description": "Browse, upload and download files and folders to and from the Workspace" }, - { - "env": "CRONICLE_URL", - "name": "Cronicle", - "image": "assets/home/Cronicle.jpg", - "description": "Schedule jobs, manage schedules, observe and monitor executions (user/pass - admin/admin)" - }, { "env": "UNGIT_URL", "name": "Ungit", @@ -87,6 +81,12 @@ "image": "assets/home/Static-server.png", "description": "Serve any static websites like a breeze" }, + { + "env": "CRONICLE_URL", + "name": "Cronicle", + "image": "assets/home/Cronicle.jpg", + "description": "Schedule jobs, manage schedules, observe and monitor executions (user/pass - admin/admin)" + }, { "env": "MC_URL", "name": "M.Commander", diff --git a/workspaces/base-workspace/mkdocs/docs/about.md b/workspaces/base-workspace/mkdocs/docs/about.md new file mode 100644 index 0000000..a3afb8d --- /dev/null +++ b/workspaces/base-workspace/mkdocs/docs/about.md @@ -0,0 +1 @@ +Containerized environment for running jobs on schedule with browser-based scheduler, terminal and file manager. \ No newline at end of file diff --git a/workspaces/base-workspace/mkdocs/docs/assets/home/Filebrowser.png b/workspaces/base-workspace/mkdocs/docs/assets/home/Filebrowser.png index f4b5700..e9d883f 100644 Binary files a/workspaces/base-workspace/mkdocs/docs/assets/home/Filebrowser.png and b/workspaces/base-workspace/mkdocs/docs/assets/home/Filebrowser.png differ diff --git a/workspaces/base-workspace/mkdocs/docs/assets/home/MkDocs.png b/workspaces/base-workspace/mkdocs/docs/assets/home/MkDocs.png deleted file mode 100755 index 333cb6c..0000000 Binary files a/workspaces/base-workspace/mkdocs/docs/assets/home/MkDocs.png and /dev/null differ diff --git a/workspaces/base-workspace/mkdocs/docs/assets/home/Static-server.png b/workspaces/base-workspace/mkdocs/docs/assets/home/Static-server.png index 4d8fa6b..b48062f 100644 Binary files a/workspaces/base-workspace/mkdocs/docs/assets/home/Static-server.png and b/workspaces/base-workspace/mkdocs/docs/assets/home/Static-server.png differ diff --git a/workspaces/base-workspace/mkdocs/docs/assets/laptop-circle-white.svg b/workspaces/base-workspace/mkdocs/docs/assets/laptop-circle-white.svg new file mode 100644 index 0000000..8575399 --- /dev/null +++ b/workspaces/base-workspace/mkdocs/docs/assets/laptop-circle-white.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/workspaces/base-workspace/mkdocs/docs/assets/laptop-circle.svg b/workspaces/base-workspace/mkdocs/docs/assets/laptop-circle.svg new file mode 100644 index 0000000..f007ed4 --- /dev/null +++ b/workspaces/base-workspace/mkdocs/docs/assets/laptop-circle.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/workspaces/base-workspace/mkdocs/docs/stylesheets/extra.css b/workspaces/base-workspace/mkdocs/docs/stylesheets/extra.css new file mode 100644 index 0000000..bfc4d6a --- /dev/null +++ b/workspaces/base-workspace/mkdocs/docs/stylesheets/extra.css @@ -0,0 +1,21 @@ +[data-md-color-scheme="workspace"] { + --md-primary-fg-color: #2A2D2E; + --md-primary-fg-color--light: #2A2D2E; + --md-primary-fg-color--dark: #2A2D2E; + --md-accent-fg-color: #E77260; + + --md-default-bg-color: #E9EAE6; +} + +[data-md-color-scheme="workspace-dark"] { + --md-primary-fg-color: #3C3C3C; + --md-primary-fg-color--light: #3C3C3C; + --md-primary-fg-color--dark: #3C3C3C; + --md-accent-fg-color: #E77260; + + --md-default-bg-color: #1E1E1E; + --md-default-fg-color--light: #9CDCFE; + --md-typeset-color: #9CDCFE; + --md-typeset-a-color: #9CDCFE; +} + diff --git a/workspaces/base-workspace/mkdocs/mkdocs.yml b/workspaces/base-workspace/mkdocs/mkdocs.yml index a5c8d78..f11dad2 100644 --- a/workspaces/base-workspace/mkdocs/mkdocs.yml +++ b/workspaces/base-workspace/mkdocs/mkdocs.yml @@ -5,9 +5,9 @@ nav: - Home: README.md - My apps: pages/my-apps.md + - About: about.md - Docs: https://docs.alnoda.org/base-workspace/ - # =========================================================== # CONFIGURATION # =========================================================== @@ -23,26 +23,22 @@ edit_uri: "" theme: name: 'material' - favicon: 'assets/favicon.ico' - logo: 'assets/Alnoda-logo.svg' + favicon: 'assets/laptop-circle.svg' + logo: 'assets/laptop-circle-white.svg' custom_dir: overrides icon: - repo: fontawesome/brands/git-alt + repo: fontawesome/brands/github features: - navigation.instant palette: - - scheme: default + - scheme: workspace toggle: - icon: material/toggle-switch-off-outline - name: Switch to light mode - primary: brown - accent: deep orange - - scheme: slate - toggle: - icon: material/toggle-switch + icon: material/brightness-7 name: Switch to dark mode - primary: orange - accent: red + - scheme: workspace-dark + toggle: + icon: material/brightness-4 + name: Switch to light mode extra: # Link to open when your logo is clicked @@ -50,21 +46,14 @@ extra: host_url: http://docs.alnoda.org plugins: - - search # Enable Macros and jinja2 templates - macros: module_name: macros/helpers +extra_css: + - stylesheets/extra.css extra_javascript: - javascripts/config.js - https://polyfill.io/v3/polyfill.min.js?features=es6 - - - - - - - - diff --git a/workspaces/codeserver-workspace/README.md b/workspaces/codeserver-workspace/README.md index 888bbf7..4615499 100644 --- a/workspaces/codeserver-workspace/README.md +++ b/workspaces/codeserver-workspace/README.md @@ -1,7 +1,3 @@ -

- Alnoda logo -

- # Code-server workspace General-purpose containerized isolated development environment. diff --git a/workspaces/ide-workspace/Dockerfile b/workspaces/ide-workspace/Dockerfile index f17739c..e2eb22b 100644 --- a/workspaces/ide-workspace/Dockerfile +++ b/workspaces/ide-workspace/Dockerfile @@ -1,6 +1,6 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.2 +ARG image_tag=3.0 ## Images used: ARG BUILD_IMAGE=node:12.18.3 @@ -44,9 +44,8 @@ FROM ${DEPLOY_IMAGE} USER root -RUN mkdir -p -m 777 /opt/theia \ +RUN mkdir /opt/theia \ && cd /opt/theia && nodeenv --node=12.18.3 env && . env/bin/activate \ - && mkdir -p -m 777 /home/project \ && apt-get install -y libsecret-1-dev COPY --from=0 /opt/theia /opt/theia diff --git a/workspaces/ide-workspace/README.md b/workspaces/ide-workspace/README.md index 7f5f43f..27a744b 100644 --- a/workspaces/ide-workspace/README.md +++ b/workspaces/ide-workspace/README.md @@ -1,10 +1,10 @@

- Alnoda logo + Workspace logo

# IDE-workspace -General-purpose dockerized development environment. Fully isolated inside a docker container. -Includes code editor, terminal, scheduler and filebrowser. +General-purpose, fully isolated contaierized development environment. +Includes code editor, terminal, filebrowser, git manager, static file server and job scheduler.

Collage @@ -41,12 +41,13 @@ VS-Code extensions and works in browser. This means it can run inside a docker c - Python 3, Pip - Node/nodeenv - curl, wget, telnet, jq - - **Git:** git, git-flow, lazygit + - **Git:** git, git-flow - **File browsers:** mc, xplr - **Text editors:** nano, vim, mcedit - **System monitors:** ncdu, htop, glances, vizex - **Process Control:** supervisord - **Job scheduler:** cron + - **Terminal multiplexer:** tmux ## Docs diff --git a/workspaces/ide-workspace/img/laptop-circle.svg b/workspaces/ide-workspace/img/laptop-circle.svg new file mode 100644 index 0000000..f007ed4 --- /dev/null +++ b/workspaces/ide-workspace/img/laptop-circle.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/workspaces/ide-workspace/mkdocs/IDE-black.jpg b/workspaces/ide-workspace/mkdocs/IDE-black.jpg new file mode 100644 index 0000000..0330ae5 Binary files /dev/null and b/workspaces/ide-workspace/mkdocs/IDE-black.jpg differ diff --git a/workspaces/ide-workspace/mkdocs/IDE.jpg b/workspaces/ide-workspace/mkdocs/IDE.jpg index 0330ae5..e74adaa 100644 Binary files a/workspaces/ide-workspace/mkdocs/IDE.jpg and b/workspaces/ide-workspace/mkdocs/IDE.jpg differ diff --git a/workspaces/ide-workspace/mkdocs/README.md b/workspaces/ide-workspace/mkdocs/README.md index d2dd46c..06f77aa 100644 --- a/workspaces/ide-workspace/mkdocs/README.md +++ b/workspaces/ide-workspace/mkdocs/README.md @@ -75,12 +75,6 @@ "image": "assets/home/Filebrowser.png", "description": "Browse, upload and download files and folders to and from the Workspace" }, - { - "env": "CRONICLE_URL", - "name": "Cronicle", - "image": "assets/home/Cronicle.jpg", - "description": "Schedule jobs, manage schedules, observe and monitor executions (user/pass - admin/admin)" - }, { "env": "UNGIT_URL", "name": "Ungit", @@ -93,6 +87,12 @@ "image": "assets/home/Static-server.png", "description": "Serve any static websites like a breeze" }, + { + "env": "CRONICLE_URL", + "name": "Cronicle", + "image": "assets/home/Cronicle.jpg", + "description": "Schedule jobs, manage schedules, observe and monitor executions (user/pass - admin/admin)" + }, { "env": "MC_URL", "name": "M.Commander", diff --git a/workspaces/ide-workspace/mkdocs/about.md b/workspaces/ide-workspace/mkdocs/about.md new file mode 100644 index 0000000..6ac226a --- /dev/null +++ b/workspaces/ide-workspace/mkdocs/about.md @@ -0,0 +1,2 @@ +General-purpose, fully isolated contaierized development environment. +Includes code editor, terminal, filebrowser, git manager, static file server and job scheduler. \ No newline at end of file diff --git a/workspaces/ide-workspace/mkdocs/mkdocs.yml b/workspaces/ide-workspace/mkdocs/mkdocs.yml index 53b4c45..b65d860 100644 --- a/workspaces/ide-workspace/mkdocs/mkdocs.yml +++ b/workspaces/ide-workspace/mkdocs/mkdocs.yml @@ -5,14 +5,14 @@ nav: - Home: README.md - My apps: pages/my-apps.md + - About: about.md - Docs: https://docs.alnoda.org/ide-workspace/ - # =========================================================== # CONFIGURATION # =========================================================== -site_name: Workspace +site_name: IDE Workspace repo_url: https://github.com/bluxmit/alnoda-workspaces site_url: https://docs.alnoda.org edit_uri: "" @@ -23,26 +23,22 @@ edit_uri: "" theme: name: 'material' - favicon: 'assets/favicon.ico' - logo: 'assets/Alnoda-logo.svg' + favicon: 'assets/laptop-circle.svg' + logo: 'assets/laptop-circle-white.svg' custom_dir: overrides icon: - repo: fontawesome/brands/git-alt + repo: fontawesome/brands/github features: - navigation.instant palette: - - scheme: default + - scheme: workspace toggle: - icon: material/toggle-switch-off-outline - name: Switch to light mode - primary: brown - accent: deep orange - - scheme: slate - toggle: - icon: material/toggle-switch + icon: material/brightness-7 name: Switch to dark mode - primary: orange - accent: red + - scheme: workspace-dark + toggle: + icon: material/brightness-4 + name: Switch to light mode extra: # Link to open when your logo is clicked @@ -50,21 +46,14 @@ extra: host_url: http://docs.alnoda.org plugins: - - search # Enable Macros and jinja2 templates - macros: module_name: macros/helpers +extra_css: + - stylesheets/extra.css extra_javascript: - javascripts/config.js - https://polyfill.io/v3/polyfill.min.js?features=es6 - - - - - - - - diff --git a/workspaces/theia-workspace/mkdocs/docs/assets/home/Filebrowser.png b/workspaces/theia-workspace/mkdocs/docs/assets/home/Filebrowser.png index f4b5700..e9d883f 100644 Binary files a/workspaces/theia-workspace/mkdocs/docs/assets/home/Filebrowser.png and b/workspaces/theia-workspace/mkdocs/docs/assets/home/Filebrowser.png differ