update --check logic, nodered v. webmap version compatibility, support test.pypi

.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 virtualenv

.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"
+  }

.gitignore

@@ -60,7 +60,7 @@ terraform.rc
 
 # ansible
 ansible_log.rb
-ansible.cfg
+
 /.vagrant/bundler/global.sol
 /.vagrant/machines/default/digital_ocean/action_provision
 /.vagrant/machines/default/digital_ocean/creator_uid
@@ -72,3 +72,9 @@ ansible.cfg
 /.vagrant/*
 /.byebug_history
 /docs/DEV.md
+
+apt_inst.so
+apt_pkg.so
+
+git-error-*
+

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.

containers/devel-compose.yaml

@@ -0,0 +1,101 @@
+services:
+  freetakserver:
+    # if you want a specific branch, change master to your branch name
+    image: ghcr.io/freetakteam/freetakserver:master
+    hostname: freetakserver
+    networks:
+        - taknet
+    volumes:
+      - free-tak-core-db:/opt/fts/
+    ports:
+      # DataPackagePort
+      - 8080:8080
+      # CoTPort
+      - 8087:8087
+      # SSLCoTPort
+      - 8089:8089
+      # SSLDataPackagePort
+      - 8443:8443
+      # FederationPort
+      - 9000:9000
+      # APIPort - Don't expose by default
+      - 19023:19023
+
+    environment:
+        # The ChangeMe section
+        FTS_FED_PASSWORD: "defaultpass"
+        FTS_CLIENT_CERT_PASSWORD: "supersecret"
+        FTS_WEBSOCKET_KEY: "YourWebsocketKey"
+        FTS_SECRET_KEY: "vnkdjnfjknfl1232#"
+        #FTS_NODE_ID: "SOMESTRING"
+        FTS_CONNECTION_MESSAGE: "Welcome to FreeTAKServer. The Parrot is not dead. It’s just resting"
+
+        # Networking
+        FTS_COT_PORT: 8087
+        FTS_SSLCOT_PORT: 8089
+        FTS_API_PORT: 19023
+        FTS_FED_PORT: 9000
+
+        FTS_DP_ADDRESS: 'freetakserver'
+        FTS_USER_ADDRESS: 'freetakserver'
+        FTS_API_ADDRESS: 'freetakserver'
+
+        FTS_ROUTING_PROXY_SUBSCRIBE_PORT: 19030
+        FTS_ROUTING_PROXY_SUBSCRIBE_IP: 'freetakserver'
+
+        FTS_ROUTING_PROXY_PUBLISHER_PORT: 19032
+        FTS_ROUTING_PROXY_PUBLISHER_IP: 'freetakserver'
+
+        FTS_ROUTING_PROXY_SERVER_PORT: 19031
+        FTS_ROUTING_PROXY_SERVER_IP: 'freetakserver'
+
+        FTS_INTEGRATION_MANAGER_PULLER_PORT: 19033 # port to receive worker responses by the integration manager
+        FTS_INTEGRATION_MANAGER_PULLER_ADDRESS: 'freetakserver' # address to receive worker responses by the integration manager
+
+        FTS_INTEGRATION_MANAGER_PUBLISHER_PORT: 19034 # port from which to publish messages by the integration manager
+        FTS_INTEGRATION_MANAGER_PUBLISHER_ADDRESS: 'freetakserver' # address from which to publish messages by the integration manager
+
+        # Misc Settings
+        FTS_OPTIMIZE_API: True
+        FTS_DATA_RECEPTION_BUFFER: 1024
+        FTS_MAX_RECEPTION_TIME: 4
+        FTS_NUM_ROUTING_WORKERS: 3
+        FTS_COT_TO_DB: True
+        # number of milliseconds to wait between each iteration of main loop
+        # decreasing will increase CPU usage and server performance
+        # increasing will decrease CPU usage and server performance
+        FTS_MAINLOOP_DELAY: 100
+        FTS_EMERGENCY_RADIUS: 0 # radius of emergency within-which users will receive it
+        FTS_LOG_LEVEL: "info"
+
+  freetakserver-ui:
+    # if you want a specific branch, change master to your branch name
+    #image: ghcr.io/freetakteam/ui:master
+    image: localhost/freetakserver-ui:latest
+    hostname: freetakserver-ui
+    networks:
+        - taknet
+    ports:
+      - 5000:5000
+    volumes:
+      - free-tak-ui-db:/home/freetak/:Z,rw
+    environment:
+      FTS_IP: YOUR EXTERNAL URL HERE
+      FTS_API_PORT: 19023
+      FTS_API_PROTO: 'http'
+      FTS_UI_EXPOSED_IP: 'freetakserver-ui'
+      FTS_MAP_EXPOSED_IP: '127.0.0.1'
+      FTS_MAP_PORT: 8000
+      FTS_MAP_PROTO: 'http'
+      FTS_UI_PORT: 5000
+      FTS_UI_WSKEY: 'YourWebsocketKey'
+      FTS_API_KEY: 'Bearer token'
+      FTS_UI_SQLALCHEMY_DATABASE_URI: 'sqlite:////home/freetak/data/FTSServer-UI.db'
+
+volumes:
+  free-tak-core-db:
+  free-tak-ui-db:
+
+networks:
+    taknet:
+        driver: bridge