diff --git a/workspaces/codeserver-workspace/Dockerfile b/workspaces/codeserver-workspace/Dockerfile index 396a2af..63801e3 100644 --- a/workspaces/codeserver-workspace/Dockerfile +++ b/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} diff --git a/workspaces/ide-workspace/Dockerfile b/workspaces/ide-workspace/Dockerfile index 1ba0d54..f2e702c 100644 --- a/workspaces/ide-workspace/Dockerfile +++ b/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 diff --git a/workspaces/ide-workspace/README.md b/workspaces/ide-workspace/README.md index 1c35247..7a0d0f2 100644 --- a/workspaces/ide-workspace/README.md +++ b/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 diff --git a/workspaces/ubuntu-docker-workspace/Dockerfile-20.04-docker b/workspaces/ubuntu-docker-workspace/Dockerfile similarity index 83% rename from workspaces/ubuntu-docker-workspace/Dockerfile-20.04-docker rename to workspaces/ubuntu-docker-workspace/Dockerfile index 5e9b12c..adaf6cd 100644 --- a/workspaces/ubuntu-docker-workspace/Dockerfile-20.04-docker +++ b/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 - diff --git a/workspaces/ubuntu-docker-workspace/README.md b/workspaces/ubuntu-docker-workspace/README.md index 1a90d22..864a349 100644 --- a/workspaces/ubuntu-docker-workspace/README.md +++ b/workspaces/ubuntu-docker-workspace/README.md @@ -1,15 +1,53 @@ -https://github.com/bcicen/ctop +

+ Alnoda logo +

+ +# 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) +
+ Demo: Ubuntu-workspace +
- - - - - - -#### Candidates -- [dockly](https://github.com/lirantal/dockly) -- [dockdash](https://github.com/byrnedo/dockdash) +

+ Ubuntu workspace +

diff --git a/workspaces/ubuntu-docker-workspace/docs/getting-started.md b/workspaces/ubuntu-docker-workspace/docs/getting-started.md new file mode 100644 index 0000000..67ee288 --- /dev/null +++ b/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 +``` + +

+ Ctop +

+ +## [Lazydocker](https://github.com/jesseduffield/lazydocker) + +A simple terminal UI for both docker and docker-compose, written in Go with the gocui library. + +``` +lazydocker +``` + +

+ Lazydockerr +

+ +## [Sen](https://github.com/TomasTomecek/sen) + +A terminal user interface for containers. + +``` +sen +``` + +

+ sen +

+ +## [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 +``` + +

+ dive +

+ +## 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) + \ No newline at end of file diff --git a/workspaces/ubuntu-docker-workspace/img/ctop.png b/workspaces/ubuntu-docker-workspace/img/ctop.png new file mode 100644 index 0000000..c272491 Binary files /dev/null and b/workspaces/ubuntu-docker-workspace/img/ctop.png differ diff --git a/workspaces/ubuntu-docker-workspace/img/dive.png b/workspaces/ubuntu-docker-workspace/img/dive.png new file mode 100644 index 0000000..bcb893f Binary files /dev/null and b/workspaces/ubuntu-docker-workspace/img/dive.png differ diff --git a/workspaces/ubuntu-docker-workspace/img/lazydocker.png b/workspaces/ubuntu-docker-workspace/img/lazydocker.png new file mode 100644 index 0000000..e6b741e Binary files /dev/null and b/workspaces/ubuntu-docker-workspace/img/lazydocker.png differ diff --git a/workspaces/ubuntu-docker-workspace/img/sen.png b/workspaces/ubuntu-docker-workspace/img/sen.png new file mode 100644 index 0000000..096b88e Binary files /dev/null and b/workspaces/ubuntu-docker-workspace/img/sen.png differ diff --git a/workspaces/ubuntu-workspace/README.md b/workspaces/ubuntu-workspace/README.md index 20db5cf..1608696 100644 --- a/workspaces/ubuntu-workspace/README.md +++ b/workspaces/ubuntu-workspace/README.md @@ -2,8 +2,8 @@ Alnoda logo

-# 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 diff --git a/workspaces/ubuntu-workspace/docs/getting-started.md b/workspaces/ubuntu-workspace/docs/getting-started.md index e123c17..c5cdaf3 100644 --- a/workspaces/ubuntu-workspace/docs/getting-started.md +++ b/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 +```

Moonlignt commander @@ -61,7 +63,12 @@ mcedit sendmail.py Htop

+## 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.