release 2.0: ubuntu-docker-wrk

workspaces/codeserver-workspace/Dockerfile

@@ -1,5 +1,5 @@
 ARG docker_registry=docker.io/alnoda
-ARG image_tag=20.04-2.0
+ARG image_tag=2.0
 
 FROM ${docker_registry}/base-workspace:${image_tag}
 

workspaces/ide-workspace/Dockerfile

@@ -1,7 +1,7 @@
 
 
 ARG docker_registry=docker.io/alnoda
-ARG image_tag=20.04-2.0
+ARG image_tag=2.0
 
 ## Images used:
 ARG BUILD_IMAGE=node:12.18.3

workspaces/ide-workspace/README.md

@@ -36,7 +36,7 @@ VS-Code extensions and works in browser. This means it can run inside a docker c
 - [**Midnight Commander**](https://midnight-commander.org/)  - Feature rich visual file manager with internal text viewer and editor. 
 - [**Process Monitor**](https://htop.dev/)  - Monitor running process and resource utilization. 
 - Quicklaunch UI with getting started tutorial
-- **Ubuntu 20.4** with the following CLI apps installed:
+- **Ubuntu 20.4** with:
     - [Zsh](https://www.zsh.org/), [Oh my Zsh](https://ohmyz.sh/)
     - Python 3, Pip 
     - Node/nodeenv

workspaces/ubuntu-docker-workspace/Dockerfile

@@ -10,6 +10,11 @@ RUN echo "------------------------------------------------------ Docker" \
         $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null \
     && apt-get update \
     && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \
+    && echo "------------------------------------------------------ Ctop" \
+    && echo "deb http://packages.azlux.fr/debian/ buster main" | tee /etc/apt/sources.list.d/azlux.list \
+    && wget -qO - https://azlux.fr/repo.gpg.key | apt-key add - \
+    && apt-get update \
+    && apt-get install -y docker-ctop \
     && echo "------------------------------------------------------ Lazydocker" \
     && wget -P /tmp https://github.com/jesseduffield/lazydocker/releases/download/v0.12/lazydocker_0.12_Linux_x86.tar.gz \
     && mkdir /tmp/lazydocker  && tar -xzf /tmp/lazydocker_0.12_Linux_x86.tar.gz --directory /tmp/lazydocker \
@@ -25,4 +30,3 @@ RUN echo "------------------------------------------------------ Docker" \
     && rm /tmp/dive_0.9.2_linux_amd64.deb 
     
 USER abc
-

workspaces/ubuntu-docker-workspace/README.md

@@ -1,15 +1,53 @@
-https://github.com/bcicen/ctop
+<p align="center">
+  <img src="https://github.com/bluxmit/alnoda-workspaces/blob/main/img/Alnoda-white.svg" alt="Alnoda logo" width="150">
+</p>  
+
+# Ubuntu docker workspace
+Containerized Linux terminal environment. Essentially Ubuntu 20.04 docker image extended with typical console apps, such as Git, 
+file browsers and system monitors. Has docker in docker.
+
+Start
+
+```
+docker run --name space-1 -d -p 8026:8026 -v /var/run/docker.sock:/var/run/docker.sock --user=root alnoda/ubuntu-docker-workspace
+```
+
+Enter workspace
+
+```
+docker exec -it space-1 /bin/zsh
+```
+
+## Features
+
+- **Ubuntu 20.4** with:
+    - Docker
+    - [Ctop](https://github.com/bcicen/ctop) - Top-like interface for container metrics.
+    - [Lazydocker](https://github.com/jesseduffield/lazydocker) - A simple terminal UI for both docker and docker-compose, written in Go with the gocui library.
+    - [Sen](https://github.com/TomasTomecek/sen) - A terminal user interface for containers.
+    - [Dive](https://github.com/wagoodman/dive) - A tool for exploring a docker image, layer contents, and discovering ways to shrink the size of your Docker/OCI image.
+    - [Zsh](https://www.zsh.org/), [Oh my Zsh](https://ohmyz.sh/)
+    - Python 3, Pip 
+    - Node/nodeenv
+    - git, git-flow, lazygit 
+    - curl, wget, telnet, jq
+    - nano, vim, mc
+    - ncdu, htop, glances, vizex
+    - supervisord
+    - cron
+
+## Why this image
+
+If you need to isolate some work without polluting main environment.
+
+## Docs
+See our guides on [**getting started**](docs/getting-started.md) and [**advanced features**](../ubuntu-workspace/docs/workspaces.md).
 
 
-[Lazydocker](https://github.com/jesseduffield/lazydocker)
-[Sen](https://github.com/TomasTomecek/sen)
+<div align="center" style="font-style: italic;">
+    Demo: Ubuntu-workspace
+</div>
 
-
-
-
-
-
-
-#### Candidates
-- [dockly](https://github.com/lirantal/dockly)
-- [dockdash](https://github.com/byrnedo/dockdash)
+<p align="center">
+  <img src="https://raw.githubusercontent.com/bluxmit/alnoda-workspaces/main/workspaces/ubuntu-workspace/img/ubuntu-workspace.gif" alt="Ubuntu workspace" width="900">
+</p>

workspaces/ubuntu-docker-workspace/docs/getting-started.md

@@ -0,0 +1,60 @@
+# Get started
+
+## [Ctop](https://github.com/bcicen/ctop)
+
+Top-like interface for container metrics.  
+
+```
+ctop
+```
+
+<p align="center">
+  <img src="https://raw.githubusercontent.com/bluxmit/alnoda-workspaces/main/workspaces/ubuntu-docker-workspace/img/ctop.png" alt="Ctop" width="500">
+</p>
+
+## [Lazydocker](https://github.com/jesseduffield/lazydocker) 
+
+A simple terminal UI for both docker and docker-compose, written in Go with the gocui library.
+
+```
+lazydocker
+```
+
+<p align="center">
+  <img src="https://raw.githubusercontent.com/bluxmit/alnoda-workspaces/main/workspaces/ubuntu-docker-workspace/img/lazydocker.png" alt="Lazydockerr" width="750">
+</p>
+
+## [Sen](https://github.com/TomasTomecek/sen)
+
+A terminal user interface for containers.
+
+```
+sen
+```
+
+<p align="center">
+  <img src="https://raw.githubusercontent.com/bluxmit/alnoda-workspaces/main/workspaces/ubuntu-docker-workspace/img/sen.png" alt="sen" width="750">
+</p>
+
+## [Dive](https://github.com/wagoodman/dive)
+
+A tool for exploring a docker image, layer contents, and discovering ways to shrink the size of your Docker/OCI image.
+    
+```
+docker pull postgres
+dive alpine/postgres 
+```
+
+<p align="center">
+  <img src="https://raw.githubusercontent.com/bluxmit/alnoda-workspaces/main/workspaces/ubuntu-docker-workspace/img/dive.png" alt="dive" width="750">
+</p>
+
+## Browser terminal
+
+This workspace has browser-based terminal up and running. Open [localhost:8026](http://localhost:8026) in browser. 
+Start the workspace on Rasberri Pi and use it via Tablet.
+
+## Extra
+
+This workspace has all the features of the [**ubuntu-workspace**](../../ubuntu-workspace/README.md)   
+ 

workspaces/ubuntu-workspace/README.md

@@ -2,8 +2,8 @@
   <img src="https://github.com/bluxmit/alnoda-workspaces/blob/main/img/Alnoda-white.svg" alt="Alnoda logo" width="150">
 </p>  
 
-# Ubuntu-workspace
-Containerized Linux terminal environment. Essentially Ubuntu 20.04 docker image extended with typical console apps installed, such as Git, 
+# Ubuntu workspace
+Containerized Linux terminal environment. Essentially Ubuntu 20.04 docker image extended with typical console apps, such as Git, 
 file browsers and system monitors.
 
 Start

workspaces/ubuntu-workspace/docs/getting-started.md

@@ -22,7 +22,9 @@ docker exec -it --user=root space-1 /bin/zsh
 
 Explore file system with Midnight Commander
 
-> ```mc```
+```
+mc
+```
 
 <p align="center">
   <img src="https://raw.githubusercontent.com/bluxmit/alnoda-workspaces/main/workspaces/ubuntu-workspace/img/mc.png" alt="Moonlignt commander" width="750">
@@ -61,7 +63,12 @@ mcedit sendmail.py
   <img src="https://raw.githubusercontent.com/bluxmit/alnoda-workspaces/main/workspaces/ubuntu-workspace/img/mcedit.png" alt="Htop" width="750">
 </p>
 
+## Browser terminal
+
+This workspace has browser-based terminal up and running. Open [localhost:8026](http://localhost:8026) in browser. 
+Start the workspace on Rasberri Pi and use it via Tablet.
+
 ## Docker in docker
 
-If you want to use docker, check out **ubuntu-docker-workspace**. It is the same, but with docker-in-docker. 
+If you want to use docker, check out [**ubuntu-docker-workspace**](../../ubuntu-docker-workspace/README.md). It is the same, but with docker-in-docker.