release 2.2: up to redis wrk

workspaces/python-workspace/Dockerfile

@@ -6,11 +6,11 @@ FROM ${docker_registry}/ide-workspace:${image_tag}
 USER root
 
 COPY python-requirements.txt /home/abc/installed-python-packages
-COPY ./mkdocs/mkdocs.yml /home/docs/mkdocs.yml
-COPY docs/getting-started.md /home/docs/docs/getting-started.md
 COPY ./examples/ /home/examples/
 COPY .pylintrc /home/abc/
 
+COPY ./mkdocs/mkdocs.yml /home/docs/mkdocs.yml
+
 RUN pip install -r /home/abc/installed-python-packages/python-requirements.txt \
     && echo "------------------------------------------------------ graphviz" \
     && apt-get update \

workspaces/python-workspace/README.md

@@ -8,7 +8,7 @@ Docker image for Python development environment. Includes Python, python tooling
 static server, job scheduler.
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/bluxmit/alnoda-workspaces/main/workspaces/python-workspace/img/python-wid-collage-sm.jpg" alt="Collage" width="750">
+  <img src="img/python-wid-collage-sm.jpg" alt="Collage" width="750">
 </p>
 
 ## Why this images
@@ -20,7 +20,7 @@ static server, job scheduler.
 ## Start
  
 ```
-docker run --name space-1 -d -p 8020-8035:8020-8035 alnoda/python-workspace
+docker run --name space-1 -d -p 8020-8040:8020-8040 alnoda/python-workspace
 ```  
 
 and open [localhost:8020](http://localhost:8020) in browser.  
@@ -70,4 +70,19 @@ Image is built from **Ubuntu 20.4** with the additional CLI apps
 - **Job scheduler:** cron
 
 ## Docs
-See our guides on [**getting started**](docs/getting-started.md) and [**advanced features**](../ubuntu-workspace/docs/workspaces.md).
+
+See our guides on 
+
+- [**getting started**](https://docs.alnoda.org/get-started/common-features/)
+- [**workspace tutorial**](https://docs.alnoda.org/postgres-workspace/tutorial/) 
+- [**project docs**](https://docs.alnoda.org/)
+
+## Demo
+
+<div align="center" style="font-style: italic;">
+    Demo: Python workspace
+</div>
+
+<p align="center">
+  <img src="img/python-wid.gif" alt="postgres-wid-demo" width="750">
+</p> 

workspaces/python-workspace/mkdocs/mkdocs.yml

@@ -4,16 +4,17 @@
 
 nav:
   - Home: README.md
-  - Get started: getting-started.md
+  - My apps: pages/my-apps.md
+  - Docs: https://docs.alnoda.org/python-workspace/
 
 
 # ===========================================================
 # CONFIGURATION
 # ===========================================================
 
-site_name: My Python Workspace
+site_name: Python workspace
 repo_url: https://github.com/bluxmit/alnoda-workspaces
-site_url: https://alnoda.org
+site_url: https://docs.alnoda.org
 edit_uri: ""
 
 # ===========================================================
@@ -42,12 +43,11 @@ theme:
         name: Switch to light mode
       primary: indigo  
       accent: deep orange
-    
 
 extra:
   # Link to open when your logo is clicked
-  homepage: https://alnoda.org
-  host_url: http://localhost
+  homepage: https://docs.alnoda.org
+  host_url: http://docs.alnoda.org
 
 plugins:
   - search

workspaces/r-workspace/Dockerfile

@@ -4,10 +4,13 @@ ARG image_tag=2.2
 FROM ${docker_registry}/base-workspace:${image_tag}
 USER root
 
-COPY mkdocs /home/docs
-COPY docs/getting-started.md /home/docs/docs/getting-started.md
 COPY supervisord-rstudio.conf /etc/supervisord/
 
+COPY ./mkdocs/mkdocs.yml /home/docs/mkdocs.yml 
+COPY ./mkdocs/helpers.py /home/docs/macros
+COPY ./mkdocs/RStudio.png /home/docs/docs/assets/home/
+COPY ./mkdocs/README.md /home/docs/docs/README.md
+
 ### R
 ENV R_VERSION=4.2.0 \
     R_HOME=/usr/local/lib/R \

workspaces/r-workspace/README.md

@@ -19,7 +19,7 @@ Docker image with R and browser-based RStudio version.
 ## Start
  
 ```
-docker run --name space-1 -d -p 8020-8035:8020-8035 alnoda/r-workspace
+docker run --name space-1 -d -p 8020-8040:8020-8040 alnoda/r-workspace
 ```  
 
 and open [localhost:8020](http://localhost:8020) in browser.  
@@ -55,5 +55,9 @@ Image is built from **Ubuntu 20.4** with the additional CLI apps
 - **Job scheduler:** cron
 
 ## Docs
-See our guides on [**getting started**](docs/getting-started.md) and [**advanced features**](../ubuntu-workspace/docs/workspaces.md).
 
+See our guides on 
+
+- [**getting started**](https://docs.alnoda.org/get-started/common-features/)
+- [**workspace tutorial**](https://docs.alnoda.org/r-workspace/tutorial/) 
+- [**project docs**](https://docs.alnoda.org/)

workspaces/r-workspace/mkdocs/helpers.py

@@ -14,7 +14,9 @@ port_increments = {
     "TERMINAL_URL": 6,
     "MC_URL": 7,
     "HTOP_URL": 8,
-    "REDIS_COMMANDER_URL": 9
+    "PORT_8038": 18,
+    "PORT_8039": 19,
+    "PORT_8040": 20
     }
 
 # this function name should not be changed

workspaces/r-workspace/mkdocs/mkdocs.yml

@@ -4,16 +4,17 @@
 
 nav:
   - Home: README.md
-  - Get started: getting-started.md
+  - My apps: pages/my-apps.md
+  - Docs: https://docs.alnoda.org/r-workspace/
 
 
 # ===========================================================
 # CONFIGURATION
 # ===========================================================
 
-site_name: My Workspace
+site_name: R workspace
 repo_url: https://github.com/bluxmit/alnoda-workspaces
-site_url: https://alnoda.org
+site_url: https://docs.alnoda.org
 edit_uri: ""
 
 # ===========================================================
@@ -34,19 +35,19 @@ theme:
       toggle:
         icon: material/toggle-switch-off-outline
         name: Switch to light mode
-      primary: brown  
-      accent: deep orange
+      primary: white  
+      accent: blue
     - scheme: slate
       toggle:
         icon: material/toggle-switch
         name: Switch to dark mode
-      primary: orange
-      accent: red
+      primary: white
+      accent: blue
 
 extra:
   # Link to open when your logo is clicked
-  homepage: https://alnoda.org
-  host_url: http://localhost
+  homepage: https://docs.alnoda.org
+  host_url: http://docs.alnoda.org
 
 plugins:
   - search

workspaces/r-workspace/removeme_mkdocs2/mkdocs.yml

@@ -0,0 +1,69 @@
+# ===========================================================
+# NAVIGATION
+# ===========================================================
+
+nav:
+  - Home: README.md
+  - Get started: getting-started.md
+
+
+# ===========================================================
+# CONFIGURATION
+# ===========================================================
+
+site_name: My Workspace
+repo_url: https://github.com/bluxmit/alnoda-workspaces
+site_url: https://alnoda.org
+edit_uri: ""
+
+# ===========================================================
+# APPEARANCE
+# ===========================================================
+
+theme:
+  name: 'material'
+  favicon: 'assets/favicon.ico'
+  logo: 'assets/Alnoda-logo.svg'
+  custom_dir: overrides
+  icon:
+    repo: fontawesome/brands/git-alt
+  features:
+    - navigation.instant
+  palette:
+    - scheme: default
+      toggle:
+        icon: material/toggle-switch-off-outline
+        name: Switch to light mode
+      primary: brown  
+      accent: deep orange
+    - scheme: slate
+      toggle:
+        icon: material/toggle-switch
+        name: Switch to dark mode
+      primary: orange
+      accent: red
+
+extra:
+  # Link to open when your logo is clicked
+  homepage: https://alnoda.org
+  host_url: http://localhost
+
+plugins:
+  - search
+  # Enable Macros and jinja2 templates
+  - macros:
+      module_name: macros/helpers
+
+
+extra_javascript:
+  - javascripts/config.js
+  - https://polyfill.io/v3/polyfill.min.js?features=es6
+
+
+
+
+          
+ 
+
+
+

workspaces/redis-workspace/Dockerfile

@@ -52,8 +52,10 @@ COPY --from=0 /opt/theia /opt/theia
 COPY settings.json /home/abc/.theia/settings.json
 COPY supervisord-redis-wid.conf /etc/supervisord/
 
-COPY mkdocs /home/docs
-COPY docs/getting-started.md /home/docs/docs/getting-started.md
+COPY ./mkdocs/mkdocs.yml /home/docs/mkdocs.yml 
+COPY ./mkdocs/helpers.py /home/docs/macros
+COPY ./mkdocs/Redis-commander.png /home/docs/docs/assets/home/
+COPY ./mkdocs/README.md /home/docs/docs/README.md
 
 ENV SHELL=/bin/bash \
     THEIA_DEFAULT_PLUGINS=local-dir:/opt/theia/plugins \ 

workspaces/redis-workspace/README.md

@@ -7,7 +7,7 @@
 Docker image with Redis, Redis Commander and several CLI tools to interact with Redis.
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/bluxmit/alnoda-workspaces/main/workspaces/redis-workspace/img/redis-wid-collage.png" alt="Collage" width="750">
+  <img src="img/redis-wid-collage.png" alt="Collage" width="750">
 </p>
 
 ## Why this images
@@ -18,10 +18,10 @@ Docker image with Redis, Redis Commander and several CLI tools to interact with
 ## Start
  
 ```
-docker run --name rwid-1 -d -p 8020-8035:8020-8035 alnoda/redis-workspace
+docker run --name rwid-1 -d -p 8020-8040:8020-8040 alnoda/redis-workspace
 ```  
 
-and open [localhost:8020](http://localhost:8020) in browser.  
+open [localhost:8020](http://localhost:8020) in browser.  
 
 ## Features
 
@@ -61,4 +61,9 @@ Image is built from **Ubuntu 20.4** with the additional CLI apps
 - **Job scheduler:** cron
 
 ## Docs
-See our guides on [**getting started**](docs/getting-started.md) and [**advanced features**](../ubuntu-workspace/docs/workspaces.md).
+
+See our guides on 
+
+- [**getting started**](https://docs.alnoda.org/get-started/common-features/)
+- [**workspace tutorial**](https://docs.alnoda.org/redis-workspace/tutorial/) 
+- [**project docs**](https://docs.alnoda.org/)

workspaces/redis-workspace/mkdocs/helpers.py

@@ -0,0 +1,61 @@
+"""
+Basic example of a Mkdocs-macros module.
+Include this  {{ macros_info() }} in any page to get complete macro info
+"""
+import os
+
+port_increments = {
+    "DOCS_URL": 0,
+    "FILEBROWSER_URL": 1,
+    "STATICFS_URL": 2,
+    "CRONICLE_URL": 3,
+    "UNGIT_URL": 4,
+    "IDE_URL": 5,
+    "TERMINAL_URL": 6,
+    "MC_URL": 7,
+    "HTOP_URL": 8,
+    "REDIS_COMMANDER_URL": 9,
+    "PORT_8038": 18,
+    "PORT_8039": 19,
+    "PORT_8040": 20
+    }
+
+# this function name should not be changed
+def define_env(env):
+    """
+    This is the hook for defining variables, macros and filters
+    - variables: the dictionary that contains the environment variables
+    - macro: a decorator function, to declare a macro.
+    - filter: a function with one of more arguments,
+        used to perform a transformation
+    """
+    @env.macro
+    def get_tool_url(env):
+        try:
+            return os.environ[env]
+        except:
+            # Get host
+            host = "localhost"
+            try:
+                host = os.environ["WRK_HOST"]
+            except:
+                pass
+            proto = "http"
+            try:
+                proto = os.environ["WRK_PROTO"]
+            except:
+                pass
+            # Entry port - port relative to which other ports will be calculated 
+            entry_port = 8020
+            try:
+                entry_port = int(os.environ["ENTRY_PORT"])
+            except:
+                pass
+            # Assign port
+            try:
+                port = port_increments[env] + entry_port
+            except:
+                port = 80
+            return f"{proto}://{host}:{port}"
+
+            

workspaces/redis-workspace/mkdocs/mkdocs.yml

@@ -4,16 +4,17 @@
 
 nav:
   - Home: README.md
-  - Get started: getting-started.md
+  - My apps: pages/my-apps.md
+  - Docs: https://docs.alnoda.org/redis-workspace/
 
 
 # ===========================================================
 # CONFIGURATION
 # ===========================================================
 
-site_name: My Workspace
+site_name: Redis workspace
 repo_url: https://github.com/bluxmit/alnoda-workspaces
-site_url: https://alnoda.org
+site_url: https://docs.alnoda.org
 edit_uri: ""
 
 # ===========================================================
@@ -40,13 +41,13 @@ theme:
       toggle:
         icon: material/toggle-switch
         name: Switch to dark mode
-      primary: deep orange
-      accent: red
+      primary: red
+      accent: deep orange
 
 extra:
   # Link to open when your logo is clicked
-  homepage: https://alnoda.org
-  host_url: http://localhost
+  homepage: https://docs.alnoda.org
+  host_url: http://docs.alnoda.org
 
 plugins:
   - search

workspaces/redis-workspace/removeme_mkdocs2/mkdocs.yml

@@ -0,0 +1,69 @@
+# ===========================================================
+# NAVIGATION
+# ===========================================================
+
+nav:
+  - Home: README.md
+  - Get started: getting-started.md
+
+
+# ===========================================================
+# CONFIGURATION
+# ===========================================================
+
+site_name: My Workspace
+repo_url: https://github.com/bluxmit/alnoda-workspaces
+site_url: https://alnoda.org
+edit_uri: ""
+
+# ===========================================================
+# APPEARANCE
+# ===========================================================
+
+theme:
+  name: 'material'
+  favicon: 'assets/favicon.ico'
+  logo: 'assets/Alnoda-logo.svg'
+  custom_dir: overrides
+  icon:
+    repo: fontawesome/brands/git-alt
+  features:
+    - navigation.instant
+  palette:
+    - scheme: default
+      toggle:
+        icon: material/toggle-switch-off-outline
+        name: Switch to light mode
+      primary: red  
+      accent: deep orange
+    - scheme: slate
+      toggle:
+        icon: material/toggle-switch
+        name: Switch to dark mode
+      primary: deep orange
+      accent: red
+
+extra:
+  # Link to open when your logo is clicked
+  homepage: https://alnoda.org
+  host_url: http://localhost
+
+plugins:
+  - search
+  # Enable Macros and jinja2 templates
+  - macros:
+      module_name: macros/helpers
+
+
+extra_javascript:
+  - javascripts/config.js
+  - https://polyfill.io/v3/polyfill.min.js?features=es6
+
+
+
+
+          
+ 
+
+
+