Isolation of FTS

.devcontainer/Dockerfile

@@ -0,0 +1,4 @@
+FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04
+RUN apt-get update \
+    && apt-get install -y python3 python3-pip \
+    && pip3 install --upgrade pip

.devcontainer/devcontainer.json

@@ -0,0 +1,51 @@
+// For format details, see https://aka.ms/devcontainer.json.
+// For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
+{
+    "name": "FTS-Install",
+    // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+    "build": {
+        // Path is relative to the devcontainer.json file.
+        "dockerfile": "Dockerfile",
+        "context": "."
+    },
+
+    // Features to add to the dev container.  ore info: https://containers.dev/features.
+    "features": {
+          "ghcr.io/devcontainers/features/common-utils:2": {
+              "installZsh": "true",
+              "username": "vscode",
+              "userUid": "1000",
+              "userGid": "1000",
+              "upgradePackages": "true"
+          },
+          "ghcr.io/devcontainers/features/git:1": {
+              "version": "latest",
+              "ppa": "false"
+          }
+      },
+
+    // Use 'forwardPorts' to make a list of ports inside the container available locally.
+    // "forwardPorts": [],
+
+    // Use 'postCreateCommand' to run commands after the container is created.
+    // "postCreateCommand": "uname -a",
+
+    // Configure tool-specific properties.
+    "customizations" : {
+      "jetbrains" : {
+        "backend" : "IntelliJ"
+      }
+    },
+    "runArgs": [
+      "--net", "host",
+      "-e", "DISPLAY=:0",
+      "-e", "XAUTHORITY=/tmp/.Xauthority",
+      "-v", "${localEnv:HOME}/.Xauthority:/tmp/.Xauthority"
+    ],
+    "containerEnv": {
+      "DISPLAY": "unix:0"
+    },
+
+    // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+    // "remoteUser": "root"
+  }

.github/workflows/pending/compatibility.yml

@@ -74,9 +74,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.vagrant.d/boxes
-          key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}
+          key: "${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}"
           restore-keys: |
-            ${{ runner.os }}-vagrant-
+            "${{ runner.os }}-vagrant-"
 
       - name: Run vagrant up
         run: |

.github/workflows/pending/lint.yml

@@ -30,9 +30,9 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          key: "${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}"
           restore-keys: |
-            ${{ runner.os }}-pip-
+            "${{ runner.os }}-pip-"
 
       - name: Install test dependencies
         run: pip3 install yamllint

.github/workflows/pending/molecule_all_on_one.yml

@@ -36,9 +36,9 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          key: "${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}"
           restore-keys: |
-            ${{ runner.os }}-pip-
+            "${{ runner.os }}-pip-"
 
       - name: Install test dependencies
         run: pip3 install ansible molecule[docker] docker

.github/workflows/pending/molecule_fts_core.yml

@@ -11,7 +11,7 @@ name: FTS CORE (DOCKER)
       - '**.md'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: "${{ github.workflow }}-${{ github.ref }}"
   cancel-in-progress: true
 
 jobs:
@@ -69,9 +69,9 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          key: "${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}"
           restore-keys: |
-            ${{ runner.os }}-pip-
+            "${{ runner.os }}-pip-"
 
       - name: Install test dependencies
         run: pip3 install ansible molecule[docker] docker

.github/workflows/pending/molecule_multiple.yml

@@ -36,9 +36,9 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          key: "${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}"
           restore-keys: |
-            ${{ runner.os }}-pip-
+            "${{ runner.os }}-pip-"
 
       - name: Install test dependencies
         run: pip3 install ansible molecule[docker] docker

.github/workflows/pending/molecule_mumble.yml

@@ -69,9 +69,9 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          key: "${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}"
           restore-keys: |
-            ${{ runner.os }}-pip-
+            "${{ runner.os }}-pip-"
 
       - name: Install test dependencies
         run: pip3 install ansible molecule[docker] docker

.github/workflows/pending/molecule_noderedserver.yml

@@ -68,9 +68,9 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          key: "${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}"
           restore-keys: |
-            ${{ runner.os }}-pip-
+            "${{ runner.os }}-pip-"
 
       - name: Install test dependencies
         run: pip3 install ansible molecule[docker] docker

.github/workflows/pending/molecule_videoserver.yml

@@ -69,9 +69,9 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          key: "${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}"
           restore-keys: |
-            ${{ runner.os }}-pip-
+            "${{ runner.os }}-pip-"
 
       - name: Install test dependencies
         run: pip3 install ansible molecule[docker] docker

.gitignore

@@ -72,3 +72,9 @@ ansible.cfg
 /.vagrant/*
 /.byebug_history
 /docs/DEV.md
+
+apt_inst.so
+apt_pkg.so
+
+git-error-*
+

.justfile

@@ -0,0 +1,24 @@
+
+default:
+  @just --list
+
+MY_WD := `pwd`
+MY_IPA := `ip -4 addr show docker0 | grep -oP '(?<=inet\s)\d+(\.\d+){3}'`
+MY_BRANCH := 'issue_118'
+NO_COLOR := `TRUE`
+
+alias dbox-act := dbox-activate
+
+dbox-activate:
+  -distrobox rm -f fts
+  distrobox create --image docker.io/library/ubuntu:22.04 --name fts --yes \
+     --init --additional-packages "systemd libpam-systemd pipewire-audio-client-libraries vim snapd"
+
+  distrobox enter --name fts
+  sudo snap install just --edge --classic
+
+
+dbox-install:
+  echo "My IPA: {{MY_IPA}}, WD: {{MY_WD}}, ISSUE: {{MY_BRANCH}}"
+  sudo bash {{MY_WD}}/scripts/easy_install.sh --repo file://{{MY_WD}}/.git --branch {{MY_BRANCH:-main}} --ip-addr {{MY_IPA}}
+

containers/container_readme.md

@@ -1,35 +1,36 @@
 # Containers
 ## Full Documentation
-WIP
+**WIP**
+
 For full instructions see: https://freetakteam.github.io/FreeTAKServer-User-Docs/Installation/Docker/overview/
-WIP
+
+**WIP**
 
 ## Podman
 These containers were designed under the podman runtime, and are fully compatible with being run as rootless.
 
-If you are familiar with container infrastructure, you can simply copy this entire directory and modify the compose.yaml
-to fit your needs.
-
-## Quick Instructions
-
-For podman:
-```shell
-podman-compose up
-```
-
-or if you use non-free runtime:
 
-```shell
-docker-compose up
-```
+## Docker
+These containers are likely to work perfectly well in docker.
 
-Then refer to other FTS documentation to do appropriate configuration.
+Please consider running rootless for extra security.
 
-All config files you need should be created in the volume, so it is a good idea to create a mounted volume instead of a 
-standard volume.
-
-If you are missing any/all configuration files, ensure:
-  - Restart container to trigger copy script again
-  - Permissions are sufficient for the container to use the volume directory
-  - On selinux hosts, sticky bit may need to be set
-  - Also on selinux, you may need to reload the labels/contexts
+## Quick Instructions
+1. Copy the [`example-compose.yaml`](https://github.com/FreeTAKTeam/FreeTAKHub-Installation/blob/main/containers/example-compose.yaml)
+file to your favorite directory.
+2. Rename it to compose.yaml
+3. Run the command
+
+    For podman:
+    ```shell
+    podman-compose up
+    ```
+
+    For non-free runtime:
+
+    ```shell
+    docker-compose up
+    ```
+
+4. Then refer to other FTS documentation to do appropriate configuration using the environment variables exposed in the 
+compose file.