From 2a63fa09391bfbed6f68e3dc93b7f05366fbf426 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 28 Jun 2020 05:50:44 -0700 Subject: [PATCH] make web server work in docker --- go.mod | 10 +++++----- go.sum | 10 ++++++++++ init/docker/Dockerfile | 1 + init/webserver/index.html | 2 ++ init/webserver/static/css/index.html | 1 + init/webserver/static/images/index.html | 1 + init/webserver/static/index.html | 1 + init/webserver/static/js/index.html | 1 + 8 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 init/webserver/index.html create mode 100644 init/webserver/static/css/index.html create mode 100644 init/webserver/static/images/index.html create mode 100644 init/webserver/static/index.html create mode 100644 init/webserver/static/js/index.html diff --git a/go.mod b/go.mod index d19011f2..1d963b1d 100644 --- a/go.mod +++ b/go.mod @@ -14,13 +14,13 @@ require ( github.com/russross/blackfriday v2.0.0+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415 - github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49 - github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e + github.com/unifi-poller/influxunifi v0.0.10-0.20200628124841-cb2762a27193 + github.com/unifi-poller/inputunifi v0.0.8-0.20200628124735-b6af0039a275 + github.com/unifi-poller/lokiunifi v0.0.0-20200628124714-778a1a77f311 github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d - github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a + github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 - github.com/unifi-poller/webserver v0.0.0-20200628114213-2b89a50ff1c0 + github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598 golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golift.io/cnfg v0.0.5 // indirect diff --git a/go.sum b/go.sum index fd244e5d..f380e8d7 100644 --- a/go.sum +++ b/go.sum @@ -108,13 +108,19 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415 h1:0rYv6/Ykayeyl9zzCERwrwrWa15ES2/ctDmmr0paQ9c= github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415/go.mod h1:HO6WuWoUwuz9Hj4m9hJ8Sh7U9O1Sd62FPV+loEdCDqY= +github.com/unifi-poller/influxunifi v0.0.10-0.20200628124841-cb2762a27193 h1:GZsJAFb2ihLSluA6yVQCbfu0msFIepU8Aa4cuID0ymU= +github.com/unifi-poller/influxunifi v0.0.10-0.20200628124841-cb2762a27193/go.mod h1:ZlpigLCYu5/l1Wu8nYEIFNWZnAqg+YV3mbSuZCmcsJE= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e h1:gJyoFh49X/9Q8DxsFe2H48DjfZ46/Aw/GBxl7izKDEo= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e/go.mod h1:nFr8uB4zJtCLiQvYPypGK3aWfQ9y4cC4iIeS9PyecrU= github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49 h1:ce5cXC4eWs5TfrjvlN8ZEemKcnv7KfbUbzXDr2fHnso= github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49/go.mod h1:Rb9C8xi/qgxOO/IbwyO4Uu77qVkIhGiQv4cA2jnmNMI= +github.com/unifi-poller/inputunifi v0.0.8-0.20200628124735-b6af0039a275 h1:pbC+9LglWSAg6EE0AQPxk/Z2WowrVvEzH6cVVi/mcGo= +github.com/unifi-poller/inputunifi v0.0.8-0.20200628124735-b6af0039a275/go.mod h1:Rb9C8xi/qgxOO/IbwyO4Uu77qVkIhGiQv4cA2jnmNMI= github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e h1:MoyVcBNks+p1tYCu67UyQycyHpeCqzafWpjMir/Mjh8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= +github.com/unifi-poller/lokiunifi v0.0.0-20200628124714-778a1a77f311 h1:WBuMSFL4YpkRtwynKZU6+OcKWtuxnjenJafJDv8516o= +github.com/unifi-poller/lokiunifi v0.0.0-20200628124714-778a1a77f311/go.mod h1:vmXYivAPW6jBzKAwBYsBcNeuROxaar6gvlsoZ3RQZhs= github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e h1:pSkgIalhDdb1N0/9uTAVh7emolfFxjCxo68IXIsZzII= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= @@ -128,6 +134,8 @@ github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d h1:wS7GngTfp github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d/go.mod h1:fObadG7weiVnSpFu8pFpGfo2bYYFc7hUMe770FovSc8= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a h1:7CmCHHFUrxzaGVMRINmplAosW8BNXlWIPm05LxCPClU= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= +github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba h1:JkCbMKjUORMImfKJ0uZFomVsPJjR8fUI+tZzpnbeGds= +github.com/unifi-poller/promunifi v0.0.9-0.20200628124811-17c74bc966ba/go.mod h1:ibeILb7ndzfT+vzucBRCTCLv19TaKOcds8sKGv2ZwGA= github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 h1:T2y8JWkjZd1vz2ZKu4vmmAk9s6PUwupuTldwhfww5xY= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= @@ -141,6 +149,8 @@ github.com/unifi-poller/webserver v0.0.0-20200627080325-7ddac80e969e h1:whQsHnJJ github.com/unifi-poller/webserver v0.0.0-20200627080325-7ddac80e969e/go.mod h1:0kv/xON8tow9YE0ZmODW0Migxx2Q7vZZ+c5OVTW/kfU= github.com/unifi-poller/webserver v0.0.0-20200628114213-2b89a50ff1c0 h1:hJ+DZonWxH7KybGDIs66U64/HZyY3obuxqyO1LUiWEE= github.com/unifi-poller/webserver v0.0.0-20200628114213-2b89a50ff1c0/go.mod h1:rlM8tRx7wCxqj4+6ZkuFVt2voFoAlHhS/XTrHd7T57s= +github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598 h1:Nmo1arOOln7V7YhjcwrT2AEFN0dl43tl5NgoNF4SgiA= +github.com/unifi-poller/webserver v0.0.0-20200628115531-e071827d7598/go.mod h1:rlM8tRx7wCxqj4+6ZkuFVt2voFoAlHhS/XTrHd7T57s= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= diff --git a/init/docker/Dockerfile b/init/docker/Dockerfile index d981281b..48bd8749 100644 --- a/init/docker/Dockerfile +++ b/init/docker/Dockerfile @@ -52,6 +52,7 @@ LABEL org.opencontainers.image.created="${BUILD_DATE}" \ COPY --from=builder /${BINARY}/${BINARY}.${ARCH}.${OS} /image COPY --from=builder /${BINARY}/examples/${CONFIG_FILE}.example /etc/${BINARY}/${CONFIG_FILE} +COPY --from=builder /${BINARY}/init/webserver /usr/lib/unifi-poller/web COPY --from=builder /etc/ssl /etc/ssl COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo diff --git a/init/webserver/index.html b/init/webserver/index.html new file mode 100644 index 00000000..b2aa1c0b --- /dev/null +++ b/init/webserver/index.html @@ -0,0 +1,2 @@ +This is the main page.
+And it's empty. diff --git a/init/webserver/static/css/index.html b/init/webserver/static/css/index.html new file mode 100644 index 00000000..43759d9a --- /dev/null +++ b/init/webserver/static/css/index.html @@ -0,0 +1 @@ +You found style sheets. diff --git a/init/webserver/static/images/index.html b/init/webserver/static/images/index.html new file mode 100644 index 00000000..0426d5b9 --- /dev/null +++ b/init/webserver/static/images/index.html @@ -0,0 +1 @@ +You found images. diff --git a/init/webserver/static/index.html b/init/webserver/static/index.html new file mode 100644 index 00000000..cdf1eeb5 --- /dev/null +++ b/init/webserver/static/index.html @@ -0,0 +1 @@ +You found an empty cup of noodles. diff --git a/init/webserver/static/js/index.html b/init/webserver/static/js/index.html new file mode 100644 index 00000000..d6efd456 --- /dev/null +++ b/init/webserver/static/js/index.html @@ -0,0 +1 @@ +You found javascript.