Merge pull request #21 from bluxmit/release-3.0

Release 3.0

workspaces/ansible-terraform-workspace/Dockerfile

@@ -1,5 +1,5 @@
 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
@@ -45,7 +45,7 @@ COPY ./examples/ /home/examples/
 
 # Delete previous Theia & set up new 
 RUN rm -rf /opt/theia \
-    && mkdir -p -m 777 /opt/theia \
+    && mkdir -p /opt/theia \
     && cd /opt/theia && nodeenv --node=12.18.3 env && . env/bin/activate \
     && pip install -r /home/abc/installed-python-packages/infra-requirements.txt \
     && python3 -m pip install "ara[server]"
@@ -65,6 +65,10 @@ COPY ./mkdocs/Ara.png /home/docs/docs/assets/home/
 COPY ./mkdocs/Blast-radius.png /home/docs/docs/assets/home/
 COPY ./mkdocs/Terraform-Rover.png /home/docs/docs/assets/home/
 COPY ./mkdocs/helpers.py /home/docs/macros 
+COPY ./mkdocs/terraform-circle.svg /home/docs/docs/assets/
+COPY ./mkdocs/terraform-circle-white.svg /home/docs/docs/assets/
+COPY ./mkdocs/extra.css /home/docs/docs/stylesheets/
+COPY ./mkdocs/about.md /home/docs/docs/about.md
 
 RUN apt-get -y update \
     && apt-get install -y python-is-python3 \

workspaces/ansible-terraform-workspace/README.md

@@ -1,11 +1,11 @@
 <p align="center">
-  <img src="../../img/Alnoda-white.svg" alt="Alnoda logo" width="150">
+  <img src="./img/terraform-circle.svg" alt="Terraform logo" width="150">
 </p>  
 
 # Ansible-Terraform Workspace
 
-Dockerized development environment for Ansible and Terraform. Workspace will help to create and manage infrastructures; 
-visualize planned terraform changes; display ansible hosts plays; schedule and observe executions.
+Containerized development, execution and admin environment for Ansible and Terraform. 
+Create, provision, visualize and manage infrastructures, schedule maintenance tasks.
 
 <p align="center">
   <img src="img/ansible-terraform-wid-collage.png" alt="Collage" width="750">
@@ -42,9 +42,9 @@ and open [localhost:8020](http://localhost:8020) in browser.
 - [**Blast-Radius**](https://github.com/28mm/blast-radius)
 - [**Terraform Visual**](https://github.com/hieven/terraform-visual)
 - [**Terraform Graph**](https://www.terraform.io/docs/cli/commands/graph.html)
-- [**Inframap**](https://github.com/cycloidio/inframap)
+- [**Inframap**](https://github.com/cycloidio/inframap)**Terraform tools:**
 
-**Dev tools:**
+**Tools:**
 
 - [**Eclipse Theia**](https://theia-ide.org/docs/) - open source version of popular Visual Studio Code IDE. Theia is trully open-source, has 
 VS-Code extensions and works in browser. This means it can run inside a docker container on local machine or in cloud. A lot of beautiful color themes and many common plugins are already installed to save time.  
@@ -57,19 +57,18 @@ 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
-
-Image is built from **Ubuntu 20.4** with the additional CLI apps
-
-- [Zsh](https://www.zsh.org/), [Oh my Zsh](https://ohmyz.sh/)
-- Python 3, Pip 
-- Node/nodeenv
-- curl, wget, telnet, jq
-- **Git:** git, git-flow, lazygit 
-- **File browsers:** mc, xplr
-- **Text editors:** nano, vim, mcedit
-- **System monitors:** ncdu, htop, glances, vizex
-- **Process Control:** supervisord
-- **Job scheduler:** cron
+- **Ubuntu 20.4** with the following CLI apps
+    - [Zsh](https://www.zsh.org/), [Oh my Zsh](https://ohmyz.sh/)
+    - Python 3, Pip 
+    - Node/nodeenv
+    - curl, wget, telnet, jq
+    - **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
 

workspaces/ansible-terraform-workspace/docs/candidates.md

@@ -0,0 +1,4 @@
+Tool candidates:
+
+- [Terraspace](https://github.com/boltops-tools/terraspace)
+- [terraform-visual](https://github.com/hieven/terraform-visual)

workspaces/ansible-terraform-workspace/docs/improvements.md

@@ -0,0 +1,19 @@
+# Improvements
+
+## Fix non-standard port 9000 for terraform-rover
+
+use socat. 
+
+Install 
+
+```
+apt-get install -y socat
+```
+
+Create tunnel between port 9000 and 8033
+
+```
+socat tcp-listen:8033,reuseaddr,fork tcp:localhost:9000
+```
+
+Add this to supervisord