diff --git a/workspaces/codeserver-workspace/README.md b/workspaces/codeserver-workspace/README.md index 155b6ff..739bb65 100644 --- a/workspaces/codeserver-workspace/README.md +++ b/workspaces/codeserver-workspace/README.md @@ -13,7 +13,7 @@ Includes code editor, terminal, scheduler and filebrowser. ## Why this images 1. If you need isolated dev environment where you can code and install packages and apps without affecting the base operating system. -2. If you want self-hosted remote development environment. +2. If you are building self-hosted remote development environment. ## Start diff --git a/workspaces/elasticsearch-workspace/Dockerfile b/workspaces/elasticsearch-workspace/Dockerfile index 025bf71..079b1f6 100644 --- a/workspaces/elasticsearch-workspace/Dockerfile +++ b/workspaces/elasticsearch-workspace/Dockerfile @@ -1,6 +1,6 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1 +ARG image_tag=2.2 FROM ${docker_registry}/ide-workspace:${image_tag} USER root diff --git a/workspaces/elasticsearch-workspace/README.md b/workspaces/elasticsearch-workspace/README.md index a921fdf..ba5c6b9 100644 --- a/workspaces/elasticsearch-workspace/README.md +++ b/workspaces/elasticsearch-workspace/README.md @@ -60,5 +60,6 @@ Image is built from **Ubuntu 20.4** with the additional CLI apps See our guides - [**getting started**](https://docs.alnoda.org/get-started/common-features/) +- [**workspace tutorial**](https://docs.alnoda.org/elasticsearch-workspace/tutorial/) - [**workspace docs**](https://docs.alnoda.org/elasticsearch-workspace/) - [**project docs**](https://docs.alnoda.org/) diff --git a/workspaces/elasticsearch-workspace/docs/tutorial.md b/workspaces/elasticsearch-workspace/removeme_docs/tutorial.md similarity index 100% rename from workspaces/elasticsearch-workspace/docs/tutorial.md rename to workspaces/elasticsearch-workspace/removeme_docs/tutorial.md diff --git a/workspaces/go-workspace/Dockerfile b/workspaces/go-workspace/Dockerfile index 5f92a06..8b0558d 100644 --- a/workspaces/go-workspace/Dockerfile +++ b/workspaces/go-workspace/Dockerfile @@ -1,11 +1,11 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1 +ARG image_tag=2.2 ARG ruby_global_version=3.1.2 FROM ${docker_registry}/codeserver-workspace:${image_tag} USER root -COPY docs/getting-started.md /home/docs/docs/getting-started.md +COPY ./mkdocs/mkdocs.yml /home/docs/mkdocs.yml RUN apt-get -y update \ && echo "------------------------------------------------------ go " \ diff --git a/workspaces/go-workspace/README.md b/workspaces/go-workspace/README.md index 3aa6b4d..e18c4e1 100644 --- a/workspaces/go-workspace/README.md +++ b/workspaces/go-workspace/README.md @@ -18,7 +18,7 @@ Docker image with Go and browser-based VS-Code version. ## Start ``` -docker run --name space-1 -d -p 8020-8035:8020-8035 alnoda/go-workspace +docker run --name space-1 -d -p 8020-8040:8020-8040 alnoda/go-workspace ``` and open [localhost:8020](http://localhost:8020) in browser. @@ -55,5 +55,10 @@ 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 + +- [**getting started**](https://docs.alnoda.org/get-started/common-features/) +- [**workspace tutorial**](https://docs.alnoda.org/go-workspace/tutorial/) +- [**workspace docs**](https://docs.alnoda.org/go-workspace/) +- [**project docs**](https://docs.alnoda.org/) \ No newline at end of file diff --git a/workspaces/go-workspace/mkdocs/mkdocs.yml b/workspaces/go-workspace/mkdocs/mkdocs.yml new file mode 100644 index 0000000..78ad0b1 --- /dev/null +++ b/workspaces/go-workspace/mkdocs/mkdocs.yml @@ -0,0 +1,70 @@ +# =========================================================== +# NAVIGATION +# =========================================================== + +nav: + - Home: README.md + - My apps: pages/my-apps.md + - Docs: https://docs.alnoda.org/go-workspace/ + + +# =========================================================== +# CONFIGURATION +# =========================================================== + +site_name: Go workspace +repo_url: https://github.com/bluxmit/alnoda-workspaces +site_url: https://docs.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: light blue + accent: light blue + - scheme: slate + toggle: + icon: material/toggle-switch + name: Switch to dark mode + primary: light blue + accent: light blue + +extra: + # Link to open when your logo is clicked + homepage: https://docs.alnoda.org + host_url: http://docs.alnoda.org + +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 + + + + + + + + + diff --git a/workspaces/go-workspace/docs/getting-started.md b/workspaces/go-workspace/removeme_docs/getting-started.md similarity index 100% rename from workspaces/go-workspace/docs/getting-started.md rename to workspaces/go-workspace/removeme_docs/getting-started.md diff --git a/workspaces/java-workspace/Dockerfile-17 b/workspaces/java-workspace/Dockerfile-17 index c99623e..e4ef715 100644 --- a/workspaces/java-workspace/Dockerfile-17 +++ b/workspaces/java-workspace/Dockerfile-17 @@ -1,11 +1,11 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1 +ARG image_tag=2.2 FROM ${docker_registry}/codeserver-workspace:${image_tag} USER root COPY examples/example /home/abc/example -COPY docs/getting-started.md /home/docs/docs/getting-started.md +COPY ./mkdocs/mkdocs.yml /home/docs/mkdocs.yml RUN apt-get -y update \ && echo "------------------------------------------------------ java 17" \ diff --git a/workspaces/java-workspace/Dockerfile-8 b/workspaces/java-workspace/Dockerfile-8 index 1eee036..53d1587 100644 --- a/workspaces/java-workspace/Dockerfile-8 +++ b/workspaces/java-workspace/Dockerfile-8 @@ -1,11 +1,11 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1 +ARG image_tag=2.2 FROM ${docker_registry}/codeserver-workspace:${image_tag} USER root COPY examples/example /home/abc/example -COPY docs/getting-started.md /home/docs/docs/getting-started.md +COPY ./mkdocs/mkdocs.yml /home/docs/mkdocs.yml RUN apt-get -y update \ && echo "------------------------------------------------------ java 8" \ diff --git a/workspaces/java-workspace/README.md b/workspaces/java-workspace/README.md index 3b093d5..29581a8 100644 --- a/workspaces/java-workspace/README.md +++ b/workspaces/java-workspace/README.md @@ -18,7 +18,7 @@ Docker image with Java and browser-based VS-Code version. ## Start ``` -docker run --name space-1 -d -p 8020-8035:8020-8035 alnoda/java-workspace +docker run --name space-1 -d -p 8020-8040:8020-8040 alnoda/java-workspace ``` and open [localhost:8020](http://localhost:8020) in browser. @@ -57,8 +57,10 @@ 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 +- [**getting started**](https://docs.alnoda.org/get-started/common-features/) +- [**workspace tutorial**](https://docs.alnoda.org/java-workspace/tutorial/) +- [**workspace docs**](https://docs.alnoda.org/java-workspace/) +- [**project docs**](https://docs.alnoda.org/) diff --git a/workspaces/java-workspace/mkdocs/mkdocs.yml b/workspaces/java-workspace/mkdocs/mkdocs.yml new file mode 100644 index 0000000..568b91f --- /dev/null +++ b/workspaces/java-workspace/mkdocs/mkdocs.yml @@ -0,0 +1,70 @@ +# =========================================================== +# NAVIGATION +# =========================================================== + +nav: + - Home: README.md + - My apps: pages/my-apps.md + - Docs: https://docs.alnoda.org/java-workspace/ + + +# =========================================================== +# CONFIGURATION +# =========================================================== + +site_name: Java workspace +repo_url: https://github.com/bluxmit/alnoda-workspaces +site_url: https://docs.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: brown + accent: deep orange + +extra: + # Link to open when your logo is clicked + homepage: https://docs.alnoda.org + host_url: http://docs.alnoda.org + +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 + + + + + + + + + diff --git a/workspaces/java-workspace/docs/getting-started.md b/workspaces/java-workspace/removeme_docs/getting-started.md similarity index 100% rename from workspaces/java-workspace/docs/getting-started.md rename to workspaces/java-workspace/removeme_docs/getting-started.md diff --git a/workspaces/kafka-workspace/Dockerfile b/workspaces/kafka-workspace/Dockerfile index 32ccb1c..f25bb53 100644 --- a/workspaces/kafka-workspace/Dockerfile +++ b/workspaces/kafka-workspace/Dockerfile @@ -1,10 +1,11 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1 +ARG image_tag=2.2 ## Images used: ARG BUILD_IMAGE=node:12.18.3 ARG DEPLOY_IMAGE=${docker_registry}/base-workspace:${image_tag} +ARG MKDOCS_COPY_IMAGE=${docker_registry}/ide-workspace:${image_tag} ################################################################################ BUILD @@ -40,6 +41,7 @@ RUN yarn --pure-lockfile && \ ################################################################################ IMAGE +FROM ${MKDOCS_COPY_IMAGE} as docs_image FROM ${DEPLOY_IMAGE} USER root @@ -54,8 +56,8 @@ COPY --from=0 /opt/theia /opt/theia COPY settings.json /home/abc/.theia/settings.json COPY supervisord-kafka-wid.conf /etc/supervisord/ -COPY mkdocs /home/docs -COPY docs/getting-started.md /home/docs/docs/getting-started.md +COPY --from=docs_image /home/docs/ /home/docs/ +COPY ./mkdocs/mkdocs.yml /home/docs/mkdocs.yml ENV SHELL=/bin/bash \ THEIA_DEFAULT_PLUGINS=local-dir:/opt/theia/plugins \ diff --git a/workspaces/kafka-workspace/README.md b/workspaces/kafka-workspace/README.md index 375674c..cb1c3e1 100644 --- a/workspaces/kafka-workspace/README.md +++ b/workspaces/kafka-workspace/README.md @@ -19,7 +19,7 @@ and troubleshoot your Kafka clusters ## Start ``` -docker run --name rwid-1 -d -p 8020-8035:8020-8035 alnoda/kafka-workspace +docker run --name rwid-1 -d -p 8020-8040:8020-8040 alnoda/kafka-workspace ``` and open [localhost:8020](http://localhost:8020) in browser. @@ -63,5 +63,12 @@ Image is built from **Ubuntu 20.4** with the additional CLI apps - **Process Control:** supervisord - **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 + +- [**getting started**](https://docs.alnoda.org/get-started/common-features/) +- [**workspace tutorial**](https://docs.alnoda.org/kafka-workspace/tutorial/) +- [**workspace docs**](https://docs.alnoda.org/kafka-workspace/) +- [**project docs**](https://docs.alnoda.org/) diff --git a/workspaces/kafka-workspace/mkdocs/docs/README.md b/workspaces/kafka-workspace/mkdocs/docs/README.md deleted file mode 100644 index c6fb981..0000000 --- a/workspaces/kafka-workspace/mkdocs/docs/README.md +++ /dev/null @@ -1,130 +0,0 @@ - - - -{% - set tools = [ - { - "env": "IDE_URL", - "name": "IDE", - "image": "assets/home/IDE.jpg", - "description": "Browser-based version of Visual Studio Code. Develop in any language, install hundreeds of extensions" - }, - { - "env": "TERMINAL_URL", - "name": "Terminal", - "image": "assets/home/Terminal.png", - "description": "Full-fledged browser-based terminal with Z-shell" - }, - { - "env": "FILEBROWSER_URL", - "name": "File Browser", - "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", - "image": "assets/home/Ungit.jpg", - "description": "Manage Git repositories and work flow using beautiful UI" - }, - { - "env": "STATICFS_URL", - "name": "Static File Server", - "image": "assets/home/Static-server.png", - "description": "Serve any static websites like a breeze" - }, - { - "env": "MC_URL", - "name": "M.Commander", - "image": "assets/home/MC.jpg", - "description": "Feature rich visual file manager with internal text viewer and editor" - }, - { - "env": "HTOP_URL", - "name": "Process monitor", - "image": "assets/home/Htop.jpg", - "description": "Monitor running process and resource utilization" - } - ] -%} - - -
- {% for tool in tools %} - {% set tool_url = get_tool_url(tool.env) %} -
- - - - -
{{ tool.name }}
-
-
{{ tool.description }}
-
- {% endfor %} -
- - - - - diff --git a/workspaces/kafka-workspace/mkdocs/macros/helpers.py b/workspaces/kafka-workspace/mkdocs/macros/helpers.py deleted file mode 100644 index 11e499b..0000000 --- a/workspaces/kafka-workspace/mkdocs/macros/helpers.py +++ /dev/null @@ -1,57 +0,0 @@ -""" -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 - } - -# 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}" - - \ No newline at end of file diff --git a/workspaces/kafka-workspace/mkdocs/mkdocs.yml b/workspaces/kafka-workspace/mkdocs/mkdocs.yml index a8b1a6e..d7b52db 100644 --- a/workspaces/kafka-workspace/mkdocs/mkdocs.yml +++ b/workspaces/kafka-workspace/mkdocs/mkdocs.yml @@ -4,7 +4,8 @@ nav: - Home: README.md - - Get started: getting-started.md + - My apps: pages/my-apps.md + - Docs: https://docs.alnoda.org/kafka-workspace/ # =========================================================== @@ -13,7 +14,7 @@ nav: site_name: Kafka Workspace repo_url: https://github.com/bluxmit/alnoda-workspaces -site_url: https://alnoda.org +site_url: https://docs.alnoda.org edit_uri: "" # =========================================================== @@ -45,8 +46,8 @@ theme: extra: # Link to open when your logo is clicked - homepage: https://alnoda.org - host_url: http://localhost + homepage: https://docs.alnoda.org + host_url: https://docs.alnoda.org plugins: - search diff --git a/workspaces/kafka-workspace/docs/getting-started.md b/workspaces/kafka-workspace/removeme_docs/getting-started.md similarity index 100% rename from workspaces/kafka-workspace/docs/getting-started.md rename to workspaces/kafka-workspace/removeme_docs/getting-started.md diff --git a/workspaces/mkdocs-magicspace/Dockerfile b/workspaces/mkdocs-magicspace/Dockerfile index d14123b..62b5ec8 100644 --- a/workspaces/mkdocs-magicspace/Dockerfile +++ b/workspaces/mkdocs-magicspace/Dockerfile @@ -1,5 +1,5 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1 +ARG image_tag=2.2 FROM ${docker_registry}/ide-workspace:${image_tag} diff --git a/workspaces/mkdocs-magicspace/README.md b/workspaces/mkdocs-magicspace/README.md index 8f450db..93f67f8 100644 --- a/workspaces/mkdocs-magicspace/README.md +++ b/workspaces/mkdocs-magicspace/README.md @@ -30,7 +30,7 @@ can create a unified documentation website from multiple repositories in Github, ## Start ``` -docker run --name space-1 -d -p 8020-8035:8020-8035 alnoda/mkdocs-magicspace +docker run --name space-1 -d -p 8020-8040:8020-8040 alnoda/mkdocs-magicspace ``` and open [localhost:8020](http://localhost:8020) in browser. @@ -80,6 +80,19 @@ Image is built from **Ubuntu 20.4** with the additional CLI apps - **Job scheduler:** cron ## Docs -See our guides on [**getting started**](https://mkdocs-magicspace.alnoda.org/tutorials/get-started/), -[extended Markdown tutorials](https://mkdocs-magicspace.alnoda.org/tutorials/markdown/intro/) -and [**advanced features**](https://mkdocs-magicspace.alnoda.org/docs/). + +See our guides on + +- [**getting started**](https://mkdocs-magicspace.alnoda.org/tutorials/get-started/) +- [**extended Markdown tutorials**](https://mkdocs-magicspace.alnoda.org/tutorials/markdown/intro/) +- [**project docs**](https://docs.alnoda.org/) + +## Demo + +
+ Demo: MkDocs MagicSpace +
+ +

+ WID demo +

diff --git a/workspaces/mkdocs-magicspace/mkdocs/helpers.py b/workspaces/mkdocs-magicspace/mkdocs/helpers.py index b073784..94a0654 100644 --- a/workspaces/mkdocs-magicspace/mkdocs/helpers.py +++ b/workspaces/mkdocs-magicspace/mkdocs/helpers.py @@ -14,7 +14,10 @@ port_increments = { "TERMINAL_URL": 6, "MC_URL": 7, "HTOP_URL": 8, - "MKDOCS_LIVE": 10 + "MKDOCS_LIVE": 10, + "PORT_8038": 18, + "PORT_8039": 19, + "PORT_8040": 20 } # this function name should not be changed diff --git a/workspaces/mkdocs-magicspace/mkdocs/mkdocs.yml b/workspaces/mkdocs-magicspace/mkdocs/mkdocs.yml index 85c19c4..78459a0 100644 --- a/workspaces/mkdocs-magicspace/mkdocs/mkdocs.yml +++ b/workspaces/mkdocs-magicspace/mkdocs/mkdocs.yml @@ -4,8 +4,9 @@ nav: - Home: README.md - - About: about.md + - My apps: pages/my-apps.md - Showcase: showcase.md + - Docs: https://mkdocs-magicspace.alnoda.org/ # =========================================================== @@ -48,8 +49,8 @@ theme: extra: # Link to open when your logo is clicked - homepage: https://alnoda.org - host_url: http://localhost + homepage: https://docs.alnoda.org + host_url: https://docs.alnoda.org plugins: - search diff --git a/workspaces/nodejs-workspace/Dockerfile b/workspaces/nodejs-workspace/Dockerfile index b670e9c..96887e6 100644 --- a/workspaces/nodejs-workspace/Dockerfile +++ b/workspaces/nodejs-workspace/Dockerfile @@ -1,11 +1,11 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1 +ARG image_tag=2.2 FROM ${docker_registry}/codeserver-workspace:${image_tag} USER root -COPY docs/getting-started.md /home/docs/docs/getting-started.md +COPY ./mkdocs/mkdocs.yml /home/docs/mkdocs.yml RUN apt-get -y update \ && echo "------------------------------------------------------ system nodejs-18" \ diff --git a/workspaces/nodejs-workspace/README.md b/workspaces/nodejs-workspace/README.md index e15d103..c2f9ded 100644 --- a/workspaces/nodejs-workspace/README.md +++ b/workspaces/nodejs-workspace/README.md @@ -18,10 +18,10 @@ Docker image with Node.js and browser-based VS-Code version. ## Start ``` -docker run --name space-1 -d -p 8020-8035:8020-8035 alnoda/nodejs-workspace +docker run --name space-1 -d -p 8020-8040:8020-8040 alnoda/nodejs-workspace ``` -and open [localhost:8020](http://localhost:8020) in browser. +open [localhost:8020](http://localhost:8020) in browser. ## Features @@ -59,8 +59,10 @@ 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/nodejs-workspace/) +- [**project docs**](https://docs.alnoda.org/) diff --git a/workspaces/nodejs-workspace/mkdocs/mkdocs.yml b/workspaces/nodejs-workspace/mkdocs/mkdocs.yml new file mode 100644 index 0000000..4e3dc9d --- /dev/null +++ b/workspaces/nodejs-workspace/mkdocs/mkdocs.yml @@ -0,0 +1,70 @@ +# =========================================================== +# NAVIGATION +# =========================================================== + +nav: + - Home: README.md + - My apps: pages/my-apps.md + - Docs: https://docs.alnoda.org/nodejs-workspace/ + + +# =========================================================== +# CONFIGURATION +# =========================================================== + +site_name: Node.js workspace +repo_url: https://github.com/bluxmit/alnoda-workspaces +site_url: https://docs.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: deep orange + +extra: + # Link to open when your logo is clicked + homepage: https://docs.alnoda.org + host_url: http://docs.alnoda.org + +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 + + + + + + + + + diff --git a/workspaces/nodejs-workspace/docs/getting-started.md b/workspaces/nodejs-workspace/removeme_docs/getting-started.md similarity index 100% rename from workspaces/nodejs-workspace/docs/getting-started.md rename to workspaces/nodejs-workspace/removeme_docs/getting-started.md diff --git a/workspaces/php-workspace/Dockerfile b/workspaces/php-workspace/Dockerfile index 824be13..bf456c4 100644 --- a/workspaces/php-workspace/Dockerfile +++ b/workspaces/php-workspace/Dockerfile @@ -1,10 +1,10 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1 +ARG image_tag=2.2 FROM ${docker_registry}/codeserver-workspace:${image_tag} USER root -COPY docs/getting-started.md /home/docs/docs/getting-started.md +COPY ./mkdocs/mkdocs.yml /home/docs/mkdocs.yml RUN echo "------------------------------------------------------ PHP " \ && add-apt-repository -y ppa:ondrej/php \ diff --git a/workspaces/php-workspace/README.md b/workspaces/php-workspace/README.md index 4f7fa07..7479844 100644 --- a/workspaces/php-workspace/README.md +++ b/workspaces/php-workspace/README.md @@ -18,10 +18,10 @@ Docker image with PHP, Composer and browser-based VS-Code version. ## Start ``` -docker run --name space-1 -d -p 8020-8035:8020-8035 alnoda/php-workspace +docker run --name space-1 -d -p 8020-8040:8020-8040 alnoda/php-workspace ``` -and open [localhost:8020](http://localhost:8020) in browser. +open [localhost:8020](http://localhost:8020) in browser. ## Features @@ -56,8 +56,10 @@ 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/php-workspace/tutorial/) +- [**project docs**](https://docs.alnoda.org/) diff --git a/workspaces/php-workspace/mkdocs/mkdocs.yml b/workspaces/php-workspace/mkdocs/mkdocs.yml new file mode 100644 index 0000000..82a3b7c --- /dev/null +++ b/workspaces/php-workspace/mkdocs/mkdocs.yml @@ -0,0 +1,70 @@ +# =========================================================== +# NAVIGATION +# =========================================================== + +nav: + - Home: README.md + - My apps: pages/my-apps.md + - Docs: https://docs.alnoda.org/php-workspace/ + + +# =========================================================== +# CONFIGURATION +# =========================================================== + +site_name: PHP workspace +repo_url: https://github.com/bluxmit/alnoda-workspaces +site_url: https://docs.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: white + accent: teal + - scheme: slate + toggle: + icon: material/toggle-switch + name: Switch to dark mode + primary: white + accent: teal + +extra: + # Link to open when your logo is clicked + homepage: https://docs.alnoda.org + host_url: http://docs.alnoda.org + +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 + + + + + + + + + diff --git a/workspaces/php-workspace/docs/getting-started.md b/workspaces/php-workspace/removeme_docs/getting-started.md similarity index 100% rename from workspaces/php-workspace/docs/getting-started.md rename to workspaces/php-workspace/removeme_docs/getting-started.md diff --git a/workspaces/postgres-workspace/Dockerfile b/workspaces/postgres-workspace/Dockerfile index ea40b0f..dc3db84 100644 --- a/workspaces/postgres-workspace/Dockerfile +++ b/workspaces/postgres-workspace/Dockerfile @@ -1,12 +1,11 @@ - ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1 +ARG image_tag=2.2 ## Images used: ARG BUILD_IMAGE=node:12.18.3 ARG DEPLOY_IMAGE=${docker_registry}/base-workspace:${image_tag} - +ARG MKDOCS_COPY_IMAGE=${docker_registry}/ide-workspace:${image_tag} ################################################################################ BUILD @@ -39,6 +38,7 @@ RUN yarn --pure-lockfile && \ ################################################################################ IMAGE +FROM ${MKDOCS_COPY_IMAGE} as docs_image FROM dimitri/pgloader:ccl.latest as pgloader-builder FROM ${DEPLOY_IMAGE} @@ -54,8 +54,9 @@ COPY --from=theia-builder /opt/theia /opt/theia COPY settings.json /home/abc/.theia/settings.json COPY supervisord-postgres.conf /etc/supervisord/ -COPY mkdocs /home/docs -COPY docs/getting-started.md /home/docs/docs/getting-started.md +COPY --from=docs_image /home/docs/ /home/docs/ +COPY ./mkdocs/mkdocs.yml /home/docs/mkdocs.yml + COPY schemaspy/schemaspy.sh /opt/schemaspy/schemaspy.sh ENV SHELL=/bin/bash \ diff --git a/workspaces/postgres-workspace/README.md b/workspaces/postgres-workspace/README.md index 9f40f18..d2ac359 100644 --- a/workspaces/postgres-workspace/README.md +++ b/workspaces/postgres-workspace/README.md @@ -22,7 +22,7 @@ generate mock data, create backups, manage migrations, generate reports, schedul ## Start ``` -docker run --name space-1 -d -p 8020-8035:8020-8035 alnoda/postgres-workspace +docker run --name space-1 -d -p 8020-8040:8020-8040 alnoda/postgres-workspace ``` and open [localhost:8020](http://localhost:8020) in browser. @@ -93,7 +93,14 @@ Image is built from **Ubuntu 20.4** with the additional CLI apps - [Rclone](https://rclone.org/) - save backups to S3 ## 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
Demo: Postgres workspace diff --git a/workspaces/postgres-workspace/mkdocs/.gitignore b/workspaces/postgres-workspace/mkdocs/.gitignore deleted file mode 100644 index c9bd680..0000000 --- a/workspaces/postgres-workspace/mkdocs/.gitignore +++ /dev/null @@ -1,68 +0,0 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -env/ -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -*.egg-info/ -.installed.cfg -*.egg - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*,cover -.hypothesis/ - -# Translations -*.mo - -# Scrapy stuff: -.scrapy - -# PyBuilder -target/ - -# IPython Notebook -.ipynb_checkpoints - -# pyenv -.python-version - -# virtualenv -venv/ -ENV/ - -# MkDocs documentation -site/ \ No newline at end of file diff --git a/workspaces/postgres-workspace/mkdocs/docs/assets/Alnoda-logo.svg b/workspaces/postgres-workspace/mkdocs/docs/assets/Alnoda-logo.svg deleted file mode 100644 index db53f4c..0000000 --- a/workspaces/postgres-workspace/mkdocs/docs/assets/Alnoda-logo.svg +++ /dev/null @@ -1,70 +0,0 @@ - - - -Created with Fabric.js 3.6.3 - - - - - \ No newline at end of file diff --git a/workspaces/postgres-workspace/mkdocs/docs/assets/favicon.ico b/workspaces/postgres-workspace/mkdocs/docs/assets/favicon.ico deleted file mode 100644 index 2c8bed5..0000000 Binary files a/workspaces/postgres-workspace/mkdocs/docs/assets/favicon.ico and /dev/null differ diff --git a/workspaces/postgres-workspace/mkdocs/docs/assets/home/Cronicle.jpg b/workspaces/postgres-workspace/mkdocs/docs/assets/home/Cronicle.jpg deleted file mode 100644 index 03c56be..0000000 Binary files a/workspaces/postgres-workspace/mkdocs/docs/assets/home/Cronicle.jpg and /dev/null differ diff --git a/workspaces/postgres-workspace/mkdocs/docs/assets/home/Filebrowser.png b/workspaces/postgres-workspace/mkdocs/docs/assets/home/Filebrowser.png deleted file mode 100644 index f4b5700..0000000 Binary files a/workspaces/postgres-workspace/mkdocs/docs/assets/home/Filebrowser.png and /dev/null differ diff --git a/workspaces/postgres-workspace/mkdocs/docs/assets/home/Htop.jpg b/workspaces/postgres-workspace/mkdocs/docs/assets/home/Htop.jpg deleted file mode 100644 index 994bc13..0000000 Binary files a/workspaces/postgres-workspace/mkdocs/docs/assets/home/Htop.jpg and /dev/null differ diff --git a/workspaces/postgres-workspace/mkdocs/docs/assets/home/IDE.jpg b/workspaces/postgres-workspace/mkdocs/docs/assets/home/IDE.jpg deleted file mode 100644 index 0330ae5..0000000 Binary files a/workspaces/postgres-workspace/mkdocs/docs/assets/home/IDE.jpg and /dev/null differ diff --git a/workspaces/postgres-workspace/mkdocs/docs/assets/home/MC.jpg b/workspaces/postgres-workspace/mkdocs/docs/assets/home/MC.jpg deleted file mode 100644 index 9b0a92a..0000000 Binary files a/workspaces/postgres-workspace/mkdocs/docs/assets/home/MC.jpg and /dev/null differ diff --git a/workspaces/postgres-workspace/mkdocs/docs/assets/home/MkDocs.png b/workspaces/postgres-workspace/mkdocs/docs/assets/home/MkDocs.png deleted file mode 100755 index 333cb6c..0000000 Binary files a/workspaces/postgres-workspace/mkdocs/docs/assets/home/MkDocs.png and /dev/null differ diff --git a/workspaces/postgres-workspace/mkdocs/docs/assets/home/Static-server.png b/workspaces/postgres-workspace/mkdocs/docs/assets/home/Static-server.png deleted file mode 100644 index 4d8fa6b..0000000 Binary files a/workspaces/postgres-workspace/mkdocs/docs/assets/home/Static-server.png and /dev/null differ diff --git a/workspaces/postgres-workspace/mkdocs/docs/assets/home/Terminal.png b/workspaces/postgres-workspace/mkdocs/docs/assets/home/Terminal.png deleted file mode 100644 index 9ccb947..0000000 Binary files a/workspaces/postgres-workspace/mkdocs/docs/assets/home/Terminal.png and /dev/null differ diff --git a/workspaces/postgres-workspace/mkdocs/docs/assets/home/Ungit.jpg b/workspaces/postgres-workspace/mkdocs/docs/assets/home/Ungit.jpg deleted file mode 100644 index c09223c..0000000 Binary files a/workspaces/postgres-workspace/mkdocs/docs/assets/home/Ungit.jpg and /dev/null differ diff --git a/workspaces/postgres-workspace/mkdocs/docs/javascript/config.js b/workspaces/postgres-workspace/mkdocs/docs/javascript/config.js deleted file mode 100644 index 06dbf38..0000000 --- a/workspaces/postgres-workspace/mkdocs/docs/javascript/config.js +++ /dev/null @@ -1,16 +0,0 @@ -window.MathJax = { - tex: { - inlineMath: [["\\(", "\\)"]], - displayMath: [["\\[", "\\]"]], - processEscapes: true, - processEnvironments: true - }, - options: { - ignoreHtmlClass: ".*|", - processHtmlClass: "arithmatex" - } -}; - -document$.subscribe(() => { - MathJax.typesetPromise() -}) diff --git a/workspaces/postgres-workspace/mkdocs/mkdocs.yml b/workspaces/postgres-workspace/mkdocs/mkdocs.yml index 548a6e2..cc82de5 100644 --- a/workspaces/postgres-workspace/mkdocs/mkdocs.yml +++ b/workspaces/postgres-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/postgres-workspace/ # =========================================================== # CONFIGURATION # =========================================================== -site_name: My Workspace +site_name: Postgres 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: red - accent: deep orange + primary: indigo + accent: blue - scheme: slate toggle: icon: material/toggle-switch name: Switch to dark mode - primary: deep orange - accent: red + primary: blue + accent: light 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 diff --git a/workspaces/postgres-workspace/docs/future-candidates.md b/workspaces/postgres-workspace/removeme_docs/future-candidates.md similarity index 100% rename from workspaces/postgres-workspace/docs/future-candidates.md rename to workspaces/postgres-workspace/removeme_docs/future-candidates.md diff --git a/workspaces/postgres-workspace/docs/getting-started.md b/workspaces/postgres-workspace/removeme_docs/getting-started.md similarity index 100% rename from workspaces/postgres-workspace/docs/getting-started.md rename to workspaces/postgres-workspace/removeme_docs/getting-started.md diff --git a/workspaces/kafka-workspace/mkdocs/.gitignore b/workspaces/postgres-workspace/removeme_mkdocs2/.gitignore similarity index 100% rename from workspaces/kafka-workspace/mkdocs/.gitignore rename to workspaces/postgres-workspace/removeme_mkdocs2/.gitignore diff --git a/workspaces/postgres-workspace/mkdocs/docs/README.md b/workspaces/postgres-workspace/removeme_mkdocs2/docs/README.md similarity index 100% rename from workspaces/postgres-workspace/mkdocs/docs/README.md rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/README.md diff --git a/workspaces/kafka-workspace/mkdocs/docs/assets/Alnoda-logo.svg b/workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/Alnoda-logo.svg similarity index 100% rename from workspaces/kafka-workspace/mkdocs/docs/assets/Alnoda-logo.svg rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/Alnoda-logo.svg diff --git a/workspaces/kafka-workspace/mkdocs/docs/assets/favicon.ico b/workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/favicon.ico similarity index 100% rename from workspaces/kafka-workspace/mkdocs/docs/assets/favicon.ico rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/favicon.ico diff --git a/workspaces/kafka-workspace/mkdocs/docs/assets/home/Cronicle.jpg b/workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/Cronicle.jpg similarity index 100% rename from workspaces/kafka-workspace/mkdocs/docs/assets/home/Cronicle.jpg rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/Cronicle.jpg diff --git a/workspaces/kafka-workspace/mkdocs/docs/assets/home/Filebrowser.png b/workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/Filebrowser.png similarity index 100% rename from workspaces/kafka-workspace/mkdocs/docs/assets/home/Filebrowser.png rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/Filebrowser.png diff --git a/workspaces/kafka-workspace/mkdocs/docs/assets/home/Htop.jpg b/workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/Htop.jpg similarity index 100% rename from workspaces/kafka-workspace/mkdocs/docs/assets/home/Htop.jpg rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/Htop.jpg diff --git a/workspaces/kafka-workspace/mkdocs/docs/assets/home/IDE.jpg b/workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/IDE.jpg similarity index 100% rename from workspaces/kafka-workspace/mkdocs/docs/assets/home/IDE.jpg rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/IDE.jpg diff --git a/workspaces/kafka-workspace/mkdocs/docs/assets/home/MC.jpg b/workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/MC.jpg similarity index 100% rename from workspaces/kafka-workspace/mkdocs/docs/assets/home/MC.jpg rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/MC.jpg diff --git a/workspaces/kafka-workspace/mkdocs/docs/assets/home/MkDocs.png b/workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/MkDocs.png similarity index 100% rename from workspaces/kafka-workspace/mkdocs/docs/assets/home/MkDocs.png rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/MkDocs.png diff --git a/workspaces/postgres-workspace/mkdocs/docs/assets/home/Pev2.png b/workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/Pev2.png similarity index 100% rename from workspaces/postgres-workspace/mkdocs/docs/assets/home/Pev2.png rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/Pev2.png diff --git a/workspaces/kafka-workspace/mkdocs/docs/assets/home/Static-server.png b/workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/Static-server.png similarity index 100% rename from workspaces/kafka-workspace/mkdocs/docs/assets/home/Static-server.png rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/Static-server.png diff --git a/workspaces/kafka-workspace/mkdocs/docs/assets/home/Terminal.png b/workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/Terminal.png similarity index 100% rename from workspaces/kafka-workspace/mkdocs/docs/assets/home/Terminal.png rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/Terminal.png diff --git a/workspaces/kafka-workspace/mkdocs/docs/assets/home/Ungit.jpg b/workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/Ungit.jpg similarity index 100% rename from workspaces/kafka-workspace/mkdocs/docs/assets/home/Ungit.jpg rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/Ungit.jpg diff --git a/workspaces/postgres-workspace/mkdocs/docs/assets/home/dbdesigner.png b/workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/dbdesigner.png similarity index 100% rename from workspaces/postgres-workspace/mkdocs/docs/assets/home/dbdesigner.png rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/assets/home/dbdesigner.png diff --git a/workspaces/kafka-workspace/mkdocs/docs/javascript/config.js b/workspaces/postgres-workspace/removeme_mkdocs2/docs/javascript/config.js similarity index 100% rename from workspaces/kafka-workspace/mkdocs/docs/javascript/config.js rename to workspaces/postgres-workspace/removeme_mkdocs2/docs/javascript/config.js diff --git a/workspaces/postgres-workspace/mkdocs/macros/helpers.py b/workspaces/postgres-workspace/removeme_mkdocs2/macros/helpers.py similarity index 100% rename from workspaces/postgres-workspace/mkdocs/macros/helpers.py rename to workspaces/postgres-workspace/removeme_mkdocs2/macros/helpers.py diff --git a/workspaces/postgres-workspace/removeme_mkdocs2/mkdocs.yml b/workspaces/postgres-workspace/removeme_mkdocs2/mkdocs.yml new file mode 100644 index 0000000..548a6e2 --- /dev/null +++ b/workspaces/postgres-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 + + + + + + + + + diff --git a/workspaces/postgres-workspace/mkdocs/overrides/partials/footer.html b/workspaces/postgres-workspace/removeme_mkdocs2/overrides/partials/footer.html similarity index 100% rename from workspaces/postgres-workspace/mkdocs/overrides/partials/footer.html rename to workspaces/postgres-workspace/removeme_mkdocs2/overrides/partials/footer.html diff --git a/workspaces/python-workspace/Dockerfile b/workspaces/python-workspace/Dockerfile index 9f623c7..5d06ea5 100644 --- a/workspaces/python-workspace/Dockerfile +++ b/workspaces/python-workspace/Dockerfile @@ -1,5 +1,5 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1 +ARG image_tag=2.2 FROM ${docker_registry}/ide-workspace:${image_tag} diff --git a/workspaces/r-workspace/Dockerfile b/workspaces/r-workspace/Dockerfile index 8e399ca..e9495b5 100644 --- a/workspaces/r-workspace/Dockerfile +++ b/workspaces/r-workspace/Dockerfile @@ -1,5 +1,5 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1 +ARG image_tag=2.2 FROM ${docker_registry}/base-workspace:${image_tag} USER root diff --git a/workspaces/redis-workspace/Dockerfile b/workspaces/redis-workspace/Dockerfile index 41aafcc..b00f1ee 100644 --- a/workspaces/redis-workspace/Dockerfile +++ b/workspaces/redis-workspace/Dockerfile @@ -1,6 +1,6 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1 +ARG image_tag=2.2 ## Images used: ARG BUILD_IMAGE=node:12.18.3 diff --git a/workspaces/ruby-workspace/Dockerfile b/workspaces/ruby-workspace/Dockerfile index 658e48a..063dd34 100644 --- a/workspaces/ruby-workspace/Dockerfile +++ b/workspaces/ruby-workspace/Dockerfile @@ -1,5 +1,5 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1 +ARG image_tag=2.2 FROM ${docker_registry}/codeserver-workspace:${image_tag} USER root diff --git a/workspaces/rust-workspace/Dockerfile b/workspaces/rust-workspace/Dockerfile index 6904ed8..85bbb09 100644 --- a/workspaces/rust-workspace/Dockerfile +++ b/workspaces/rust-workspace/Dockerfile @@ -1,5 +1,5 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1 +ARG image_tag=2.2 FROM ${docker_registry}/codeserver-workspace:${image_tag} USER root diff --git a/workspaces/scala-workspace/Dockerfile b/workspaces/scala-workspace/Dockerfile index c297f89..2f1f22a 100644 --- a/workspaces/scala-workspace/Dockerfile +++ b/workspaces/scala-workspace/Dockerfile @@ -1,5 +1,5 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1-17 +ARG image_tag=2.2-17 FROM ${docker_registry}/java-workspace:${image_tag} USER root diff --git a/workspaces/streamlit-workspace/Dockerfile b/workspaces/streamlit-workspace/Dockerfile index fba51fb..9ac4c64 100644 --- a/workspaces/streamlit-workspace/Dockerfile +++ b/workspaces/streamlit-workspace/Dockerfile @@ -1,5 +1,5 @@ ARG docker_registry=docker.io/alnoda -ARG image_tag=2.1-3.8 +ARG image_tag=2.2-3.8 FROM ${docker_registry}/python-workspace:${image_tag} USER root diff --git a/workspaces/ubuntu-docker-workspace/Dockerfile b/workspaces/ubuntu-docker-workspace/Dockerfile index 50ab36e..9ebd2fa 100644 --- a/workspaces/ubuntu-docker-workspace/Dockerfile +++ b/workspaces/ubuntu-docker-workspace/Dockerfile @@ -1,4 +1,4 @@ -FROM alnoda/ubuntu-workspace:20.04-2.1 +FROM alnoda/ubuntu-workspace:20.04-2.2 USER root