Merge pull request #12 from hubbcaps/ubooq-v2

Made the necessary changes for the upgrade to stable v2 of Ubooquity

Dockerfile

@@ -7,7 +7,7 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 
 # package version
-ARG UBOOQUITY_VER="1.10.1"
+ARG UBOOQUITY_VER="2.1.0"
 
 # install build packages
 RUN \
@@ -38,5 +38,5 @@ RUN \
 COPY root/ /
 
 # ports and volumes
-EXPOSE 2202
+EXPOSE 2202 2205
 VOLUME /books /comics /config /files

README.md

@@ -31,6 +31,7 @@ docker create \
   -e MAXMEM=<maxmem> \
   -e PGID=<gid> -e PUID=<uid>  \
   -p 2202:2202 \
+  -p 2205:2205 \
   linuxserver/ubooquity
 ```
 
@@ -43,7 +44,8 @@ http://192.168.x.x:8080 would show you what's running INSIDE the container on po
 
 
 
-* `-p 2202` - the port(s)
+* `-p 2202` - the library port
+* `-p 2205` - the admin port
 * `-v /config` - Config files and database for ubooquity
 * `-v /books` - Location of books.
 * `-v /comics` - Location of comics.
@@ -78,9 +80,9 @@ In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as bel
 This container will automatically scan your files at startup.
 
 **IMPORTANT**
-Access the admin page at `http://<your-ip>:2202/ubooquity/admin/` and set a password. 
+Access the admin page at `http://<your-ip>:2205/ubooquity/admin/` and set a password. 
 
-Then you can access the webui at `http://<your-ip>:2202/ubooquity/`
+Then you can access the webui at `http://<your-ip>:2205/ubooquity/`
 
 
 ## Info
@@ -98,6 +100,7 @@ Then you can access the webui at `http://<your-ip>:2202/ubooquity/`
 
 ## Versions
 
++ **14.07.17:** Upgrade to Ubooquity 2.1.0
 + **26.05.17:** Rebase to alpine 3.6.
 + **08.04.17:** Switch to java from 3.5 repo, fixes login crashes.
 + **06.02.17:** Rebase to alpine 3.5.

root/etc/services.d/ubooquity/run

@@ -8,5 +8,6 @@ exec \
 	s6-setuidgid abc java -Xmx"$JAVAMEM"m \
 	-jar /opt/ubooquity/Ubooquity.jar \
 	--headless --host 0.0.0.0 \
-	--port 2202 --webadmin \
+	--libraryport 2202 --adminport 2205 \
+  --remoteadmin \
 	--workdir /config