unifi: convert to simplevisor

6 files changed, 70 insertions, 114 deletions

diff --git a/unifi/Dockerfile b/unifi/Dockerfile
index acb471f..a04d001 100644
--- a/unifi/Dockerfile
+++ b/unifi/Dockerfile
@@ -1,6 +1,8 @@
 FROM alpine:edge
 LABEL maintainer="Mike Crute <mike@crute.us>"
 
+# TODO: Move all the unpacking stuff to the Makefile
+
 ARG deb_location
 ARG checksum_line
 
@@ -55,7 +57,9 @@ RUN set -euxo pipefail; \
     && apk del .build-deps \
     && rm -rf /tmp/*
 
-ADD entrypoint.sh /
+ADD unifi-setup.sh /
+ADD simplevisor.json /
+ADD simplevisor /
 
 STOPSIGNAL SIGTERM
-ENTRYPOINT [ "/entrypoint.sh" ]
+ENTRYPOINT [ "/simplevisor" ]
diff --git a/unifi/Makefile b/unifi/Makefile
index 83e2fc9..b1c9503 100644
--- a/unifi/Makefile
+++ b/unifi/Makefile
@@ -1,6 +1,7 @@
 VERSION=7.2.91-85c367a4aa
-IMAGE=docker.crute.me/unifi:$(VERSION)
-LATEST=$(subst :$(VERSION),,$(IMAGE)):latest
+VERSION_TAG=$(VERSION)-1
+IMAGE=docker.crute.me/unifi:$(VERSION_TAG)
+LATEST=$(subst :$(VERSION_TAG),,$(IMAGE)):latest
 
 DEB_LOCATION="https://dl.ui.com/unifi/$(VERSION)/unifi_sysvinit_all.deb"
 CHECKSUM_LINE="d33e7b5a838a4c301ca545910e7119ba62bda80202259655191ced1e482cecde *unifi_sysvinit_all.deb"
diff --git a/unifi/Makefile5 b/unifi/Makefile5
deleted file mode 100644
index 7c2c212..0000000
--- a/unifi/Makefile5
+++ /dev/null
@@ -1,36 +0,0 @@
-VERSION=5.14.23
-IMAGE=docker.crute.me/unifi:$(VERSION)
-LATEST=$(subst :$(VERSION),,$(IMAGE)):latest
-
-DEB_LOCATION="https://dl.ui.com/unifi/$(VERSION)/unifi_sysvinit_all.deb"
-CHECKSUM_LINE="fb12d448828656523978be9f594f2ce3fb35d524bc80d2c150e58f2a7d0159a9 *unifi_sysvinit_all.deb"
-
-all:
-        docker pull alpine:latest
-        docker build \
-                --no-cache \
-                --build-arg=deb_location=$(DEB_LOCATION) \
-                --build-arg=checksum_line=$(CHECKSUM_LINE) \
-                -t $(IMAGE) .
-
-all-no-cache:
-        docker build \
-                --no-cache \
-                --build-arg=deb_location=$(DEB_LOCATION) \
-                --build-arg=checksum_line=$(CHECKSUM_LINE) \
-                -t $(IMAGE) .
-
-run:
-        docker run -d \
-                -e UNIFI_UID=1001 \
-                -e UNIFI_GID=1001 \
-                -p 8080:8080 \
-                -p 8443:8443 \
-                $(IMAGE)
-
-publish:
-        docker push $(IMAGE)
-
-publish-prod:
-        docker tag $(IMAGE) $(LATEST)
-        docker push $(LATEST)
diff --git a/unifi/README.md b/unifi/README.md
deleted file mode 100644
index c1566b2..0000000
--- a/unifi/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-[(Dockerfile)]: https://code.crute.me/mcrute/dockerfiles/tree/unifi/Dockerfile
-[Changelog]: https://community.ubnt.com/t5/UniFi-Updates-Blog/UniFi-5-6-20-Stable-has-been-released/ba-p/2119397?attachment-id=85425
-
-# Supported tags and respective `Dockerfile` links
-
-* `5.6.20`, `stable` [(Dockerfile)][] [Changelog][]
-
-
-[![unifi](https://dl.ubnt.com/press/logo-UniFi.jpg)](https://unifi-sdn.ubnt.com/)
-
-# Ubiquiti Unifi SDN Controller
-
-The UniFi Controller software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance. This unofficial image is a minimalist re-packaging of the upstream binaries into an Alpine Linux based container. The image has been adapted to better fit the Docker tooling by logging everything to stdout and running with reduced privileges.
-
-## Usage
-At a minimum users should mount a data volume over `/var/lib/unifi` for storage of their databases and downloaded firmware.
-
-A minimal run command would be:
-
-```
-docker run \
-    -v /your-unifi-path:/var/lib/unifi \
-    -p 8080:8080 \
-    -p 8443:8443 \
-    mcrute/unifi-controller:stable
-```
-
-After bootstrap the controller will run as the `unifi` user within the container. It is possible to map the unifi user id and group id within the container to a custom uid/gid using the `UNIFI_UID` and `UNIFI_GID` environment variables. The default is uid 101 and gid 102.
-
-An example of this:
-
-```
-docker run \
-    -v /your-unifi-path:/var/lib/unifi \
-    -e UNIFI_UID=201 \
-    -e UNIFI_GID=302 \
-    -p 8080:8080 \
-    -p 8443:8443 \
-    mcrute/unifi-controller:stable
-```
-
-## License
-View [license information](https://www.ubnt.com/eula/) for the software contained in this image.
-
-As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
-
-As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within.
-
-## Used Software
-This container builds on [Alpine Linux](http://alpinelinux.org/) and uses [su-exec](https://github.com/ncopa/su-exec) for privilege separation.
diff --git a/unifi/simplevisor.json b/unifi/simplevisor.json
new file mode 100644
index 0000000..0d8ed76
--- /dev/null
+++ b/unifi/simplevisor.json
@@ -0,0 +1,52 @@
+{
+    "env": {
+        "pass": [
+            "PATH",
+            "HOSTNAME",
+            "SHLVL",
+            "HOME",
+            "PWD",
+
+            "UNIFI_UID",
+            "UNIFI_GID",
+
+            "MONGO_URL",
+            "MONGO_STATS_URL"
+        ],
+        "vault-replace": [
+            "MONGO_USER",
+            "MONGO_PASSWORD"
+        ],
+        "vault-template": [
+            "MONGO_URL",
+            "MONGO_STATS_URL"
+        ]
+    },
+    "jobs": {
+        "init": [
+            {
+                "cmd": ["/unifi-setup.sh"],
+                "run-as": "root"
+            }
+        ],
+        "main": [
+            {
+                "cmd": [
+                    "/usr/lib/jvm/default-jvm/bin/java",
+                        "-cp", "/usr/lib/unifi/lib/ace.jar",
+                        "-Dlog4j.configuration=file:/usr/lib/unifi/log4j.properties",
+                        "-Dlog4j2.formatMsgNoLookups=true",
+                        "-Dunifi.datadir=/usr/lib/unifi/data",
+                        "-Dunifi.logdir=/usr/lib/unifi/logs",
+                        "-Dunifi.rundir=/usr/lib/unifi/run",
+                        "-Xmx1024M",
+                        "-Djava.awt.headless=true",
+                        "-Dorg.xerial.snappy.use.systemlib=true",
+                        "-Dfile.encoding=UTF-8",
+                        "com.ubnt.ace.Launcher", "start"
+                ],
+                "run-as": "unifi"
+            }
+        ]
+    }
+}
diff --git a/unifi/entrypoint.sh b/unifi/unifi-setup.sh
index 506c20f..30defdc 100755
--- a/unifi/entrypoint.sh
+++ b/unifi/unifi-setup.sh
@@ -56,27 +56,12 @@ if [ -z "$START_DEFAULT" ]; then
         echo "is_default=false" >> /var/lib/unifi/system.properties
 fi
 
-# Allow running a shell in the container
-if [ ! -z "$@" ]; then
-    /sbin/su-exec ${USERNAME} "$@"
-else
-    # Replace the current process with a scoped-down controller. The java app
-    # is designed to do its own job control but it has to run with an init
-    # system or it doesn't get the signals from docker.
-    #
-    # Use the snappy native library installed with apk because the bundled on
-    # is built against libc which is not available in Alpine. Without this
-    # inform will fail with a decompression library error.
-    exec /usr/bin/dumb-init -c /sbin/su-exec ${USERNAME} /usr/lib/jvm/default-jvm/bin/java \
-        -cp ${BASEDIR}/lib/ace.jar \
-        -Dlog4j.configuration=file:${BASEDIR}/log4j.properties \
-        -Dlog4j2.formatMsgNoLookups=true \
-        -Dunifi.datadir=${BASEDIR}/data \
-        -Dunifi.logdir=${BASEDIR}/logs \
-        -Dunifi.rundir=${BASEDIR}/run \
-        -Xmx1024M \
-        -Djava.awt.headless=true \
-        -Dorg.xerial.snappy.use.systemlib=true \
-        -Dfile.encoding=UTF-8 \
-        com.ubnt.ace.Launcher start
-fi
+# Replace the current process with a scoped-down controller. The java app
+# is designed to do its own job control but it has to run with an init
+# system or it doesn't get the signals from docker.
+#
+# Use the snappy native library installed with apk because the bundled on
+# is built against libc which is not available in Alpine. Without this
+# inform will fail with a decompression library error.
+
+# NOTE: This has been migrated to simplevisor.json