README.md

@@ -14,14 +14,19 @@
 1. Make sure you have docker and docker-compose installed on your host.
 2. Clone this repository.
 3. If you're on windows or macos, in the docker-compose.yml file, make sure you change the volume path `/opt/uam_data/uam_` to something that works on your OS.
-4. Optionally, add or remove services according to your needs. You can copy and paste the existing services and incement the names, paths, and ports for each of them.
+4. Optionally, add or remove services according to your needs. You can copy and paste the existing services and modify the names, paths, and ports for each of them.
 5. Execute the following command in terminal while being in the `uam-swarm` directory of this repository:
 
 ```PBKEY={YOURKEYHERE} docker-compose up -d```
 
-## Important information:
+## Information
 1. This container will download the latest version of uam every time it is started and will install apt packages so keep that in mind.
 2. The http service for uam is enabled and listening on http://127.0.0.1:17099 for the single instance. For the UAM swarm you need to define the listening port for each instance.
 3. Make sure you port forward manually as upnp will most likely not work.
 4. You can adjust the maximum upload and download bandwidth of uam by changing the `NETLIMUP` and `NETLIMDOWN` env variables.
-5. I suggest using [lazydocker](https://github.com/jesseduffield/lazydocker) to control and see the status of your containers.
+
+## ToDo:
+- [x] Add CI tests to make sure the scripts work.
+- [x] Make PBKEY a required variable to avoid running uam without it.
+- [x] Include wondershaper or sch_cake in `apt install` and environment configuration parameters for it.
+- [ ] See if it's possible to automatically increment port numbers for the swarm script.

uam-swarm/entrypoint.sh

@@ -2,11 +2,11 @@
 cd /tmp
 apt update && apt -yq install wget libglib2.0-0 ca-certificates dnsmasq wondershaper
 update-ca-certificates
+wondershaper eth0 $3 $4 &
 wget https://update.u.is/downloads/uam/linux/uam-latest_amd64.deb
 dpkg -i uam-latest_amd64.deb
 cd /opt/uam/
 echo "[net]" >> /root/.uam/uam.ini
 container_ip="$(hostname -i)"
 echo "listens=[${container_ip}]:$2" >> /root/.uam/uam.ini
-wondershaper eth0 $3 $4 &
 ./uam --pk $1 --http [0.0.0.0]:17099 --no-ui

uam/entrypoint.sh

@@ -2,11 +2,11 @@
 cd /tmp
 apt update && apt -yq install wget libglib2.0-0 ca-certificates dnsmasq wondershaper
 update-ca-certificates
+wondershaper eth0 $2 $3 &
 wget https://update.u.is/downloads/uam/linux/uam-latest_amd64.deb
 dpkg -i uam-latest_amd64.deb
 cd /opt/uam/
 echo "[net]" >> /root/.uam/uam.ini
 container_ip="$(hostname -i)"
 echo "listens=[${container_ip}]:4156" >> /root/.uam/uam.ini
-wondershaper eth0 $2 $3 &
 ./uam --pk $1 --http [0.0.0.0]:17099 --no-ui