Merge pull request #15 from linuxserver/v2

V2
pull/16/head 56
Neil 7 years ago committed by GitHub
commit 37537b3a30

@ -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 \
@ -21,12 +21,11 @@ RUN \
# install ubooquity
mkdir -p \
/opt/ubooquity \
/opt/ubooquity/fonts && \
/app/ubooquity && \
curl -o \
/tmp/ubooquity.zip -L \
"http://vaemendis.net/ubooquity/downloads/Ubooquity-${UBOOQUITY_VER}.zip" && \
unzip /tmp/ubooquity.zip -d /opt/ubooquity && \
unzip /tmp/ubooquity.zip -d /app/ubooquity && \
# cleanup
apk del --purge \
@ -38,5 +37,5 @@ RUN \
COPY root/ /
# ports and volumes
EXPOSE 2202
EXPOSE 2202 2203
VOLUME /books /comics /config /files

@ -31,6 +31,7 @@ docker create \
-e MAXMEM=<maxmem> \
-e PGID=<gid> -e PUID=<uid> \
-p 2202:2202 \
-p 2203:2203 \
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 2203` - the admin port
* `-v /config` - Config files and database for ubooquity
* `-v /books` - Location of books.
* `-v /comics` - Location of comics.
@ -75,13 +77,14 @@ In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as bel
## Setting up the application
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.
Ubooquity has now been upgraded to [version 2](http://vaemendis.net/ubooquity/article19/ubooquity-2-1-0) and for existing v1.x users we recommend cleaning your appdata and reinstalling, due to changes in the application itself making the two versions essentially incompatible with each other. Also the admin page and library pages are now on separate ports as detailed below.
Access the admin page at `http://<your-ip>:2203/ubooquity/admin/` and set a password.
Then you can access the webui at `http://<your-ip>:2202/ubooquity/`
This container will automatically scan your files at startup.
## Info
@ -98,6 +101,7 @@ Then you can access the webui at `http://<your-ip>:2202/ubooquity/`
## Versions
+ **16.07.17:** Upgrade to Ubooquity 2.1.0, see setting up application section for important info for existing v1.x users.
+ **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.

@ -0,0 +1,47 @@
{
"filesPaths" : [ {
"pathString" : "/files",
"userName" : [ ]
} ],
"comicsPaths" : [ {
"pathString" : "/comics",
"userName" : [ ]
} ],
"booksPaths" : [ {
"pathString" : "/books",
"userName" : [ ]
} ],
"users" : [ ],
"isFilesProviderEnabled" : true,
"isComicsProviderEnabled" : true,
"isBooksProviderEnabled" : true,
"isUserManagementEnabled" : false,
"libraryPortNumber" : 2202,
"adminPortNumber" : 2203,
"comicWidth" : 160,
"comicHeight" : 230,
"comicsPaginationNumber" : 30,
"bookWidth" : 160,
"bookHeight" : 230,
"booksPaginationNumber" : 30,
"minimizeToTray" : false,
"minimizeOnStartup" : false,
"autoscanPeriod" : 0,
"isRemoteAdminEnabled" : false,
"theme" : "default",
"isShrinkingCacheEnabled" : false,
"shrunkPageWidth" : 1536,
"shrunkPageHeight" : 2500,
"shrinkingCachePath" : "",
"autoScanAtLaunch" : true,
"reverseProxyPrefix" : "ubooquity",
"keystorePath" : "",
"keystorePassword" : "",
"isOpdsProviderEnabled" : false,
"folderExclusionPattern" : "",
"bypassSingleRootFolder" : false,
"enableFolderMetadataDisplay" : false,
"bookmarkUsingCookies" : false,
"displayTitleInsteadOfFileName" : false,
"keepUnreachableSharedFolders" : false
}

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<userPreferences>
<filesPaths/>
<comicsPaths>
<path>
<pathString>/comics</pathString>
<authorizedUsers/>
</path>
</comicsPaths>
<booksPaths>
<path>
<pathString>/books</pathString>
<authorizedUsers/>
</path>
</booksPaths>
<users/>
<isFilesProviderEnabled>true</isFilesProviderEnabled>
<isComicsProviderEnabled>true</isComicsProviderEnabled>
<isBooksProviderEnabled>true</isBooksProviderEnabled>
<isUserManagementEnabled>false</isUserManagementEnabled>
<portNumber>2202</portNumber>
<comicWidth>160</comicWidth>
<comicHeight>230</comicHeight>
<comicsPaginationNumber>30</comicsPaginationNumber>
<bookWidth>160</bookWidth>
<bookHeight>230</bookHeight>
<booksPaginationNumber>30</booksPaginationNumber>
<minimizeToTray>false</minimizeToTray>
<minimizeOnStartup>false</minimizeOnStartup>
<autoscanPeriod>0</autoscanPeriod>
<isWebAdminEnabled>false</isWebAdminEnabled>
<theme>Default</theme>
<isShrinkingCacheEnabled>false</isShrinkingCacheEnabled>
<shrunkPageWidth>1536</shrunkPageWidth>
<shrunkPageHeight>2400</shrunkPageHeight>
<shrinkingCachePath></shrinkingCachePath>
<autoScanAtLaunch>true</autoScanAtLaunch>
<reverseProxyPrefix>ubooquity</reverseProxyPrefix>
<keystorePath></keystorePath>
<keystorePassword></keystorePassword>
<isOpdsProviderEnabled>true</isOpdsProviderEnabled>
<hideEmptyFolder>false</hideEmptyFolder>
<folderExclusionPattern></folderExclusionPattern>
<bypassSingleRootFolder>false</bypassSingleRootFolder>
<enableFolderMetadataDisplay>false</enableFolderMetadataDisplay>
</userPreferences>

@ -5,10 +5,10 @@ mkdir -p \
config/fonts
# copy config
[[ ! -e /config/preferences.xml ]] && \
cp /defaults/preferences.xml /config/preferences.xml
[[ ! -e /config/preferences.json ]] && \
cp /defaults/preferences.json /config/preferences.json
# permissions
chown -R abc:abc \
/config \
/opt/ubooquity
/app/ubooquity

@ -2,11 +2,10 @@
JAVAMEM=${MAXMEM:-512}
cd /opt/ubooquity || exit
cd /app/ubooquity || exit
exec \
s6-setuidgid abc java -Xmx"$JAVAMEM"m \
-jar /opt/ubooquity/Ubooquity.jar \
--headless --host 0.0.0.0 \
--port 2202 --webadmin \
-jar /app/ubooquity/Ubooquity.jar \
--headless --host 0.0.0.0 --remoteadmin \
--workdir /config

Loading…
Cancel
Save