Self-Hosted
/
ubooquity
mirror of https://github.com/linuxserver/docker-ubooquity.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Migrate to s6v3

Browse Source
pull/41/head
TheSpad 2 years ago
parent 190c5eea24
commit 9dcb459fbd
No known key found for this signature in database
GPG Key ID: 08F06191F4587860
18 changed files with 106 additions and 100 deletions
Show Stats Download Patch File Download Diff File

50
Dockerfile
Unescape View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:3.13 FROM ghcr.io/linuxserver/baseimage-alpine:3.16
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@ -8,33 +8,33 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="sparklyballs" LABEL maintainer="sparklyballs"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies \
curl \ unzip && \
unzip && \ echo "**** install runtime packages ****" && \
echo "**** install runtime packages ****" && \ apk add --no-cache \
apk add --no-cache \ openjdk8-jre-base && \
openjdk8-jre-base && \ echo "**** install ubooquity ****" && \
echo "**** install ubooquity ****" && \ if [ -z ${UBOOQUITY_VERSION+x} ]; then \
if [ -z ${UBOOQUITY_VERSION+x} ]; then \ UBOOQUITY_VERSION=$(curl -IsL -w %{url_effective} -o /dev/null http://vaemendis.net/ubooquity/service/download.php \
UBOOQUITY_VERSION=$(curl -IsL -w %{url_effective} -o /dev/null http://vaemendis.net/ubooquity/service/download.php \ | sed 's|.*Ubooquity-\([0-9\.]*\).zip|\1|'); \
| sed 's|.*Ubooquity-\([0-9\.]*\).zip|\1|'); \ fi && \
fi && \ mkdir -p \
mkdir -p \ /app/ubooquity && \
/app/ubooquity && \ curl -o \
curl -o \ /tmp/ubooquity.zip -L \
/tmp/ubooquity.zip -L \ "http://vaemendis.net/ubooquity/downloads/Ubooquity-${UBOOQUITY_VERSION}.zip" && \
"http://vaemendis.net/ubooquity/downloads/Ubooquity-${UBOOQUITY_VERSION}.zip" && \ unzip /tmp/ubooquity.zip -d /app/ubooquity && \
unzip /tmp/ubooquity.zip -d /app/ubooquity && \ echo "**** cleanup ****" && \
echo "**** cleanup ****" && \ apk del --purge \
apk del --purge \ build-dependencies && \
build-dependencies && \ rm -rf \
rm -rf \ /tmp/*
/tmp/*
# copy local files # copy local files
COPY root/ / COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 2202 2203 EXPOSE 2202 2203
VOLUME /books /comics /config /files
VOLUME /config

50
Dockerfile.aarch64
Unescape View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.13 FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@ -8,33 +8,33 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="sparklyballs" LABEL maintainer="sparklyballs"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies \
curl \ unzip && \
unzip && \ echo "**** install runtime packages ****" && \
echo "**** install runtime packages ****" && \ apk add --no-cache \
apk add --no-cache \ openjdk8-jre-base && \
openjdk8-jre-base && \ echo "**** install ubooquity ****" && \
echo "**** install ubooquity ****" && \ if [ -z ${UBOOQUITY_VERSION+x} ]; then \
if [ -z ${UBOOQUITY_VERSION+x} ]; then \ UBOOQUITY_VERSION=$(curl -IsL -w %{url_effective} -o /dev/null http://vaemendis.net/ubooquity/service/download.php \
UBOOQUITY_VERSION=$(curl -IsL -w %{url_effective} -o /dev/null http://vaemendis.net/ubooquity/service/download.php \ | sed 's|.*Ubooquity-\([0-9\.]*\).zip|\1|'); \
| sed 's|.*Ubooquity-\([0-9\.]*\).zip|\1|'); \ fi && \
fi && \ mkdir -p \
mkdir -p \ /app/ubooquity && \
/app/ubooquity && \ curl -o \
curl -o \ /tmp/ubooquity.zip -L \
/tmp/ubooquity.zip -L \ "http://vaemendis.net/ubooquity/downloads/Ubooquity-${UBOOQUITY_VERSION}.zip" && \
"http://vaemendis.net/ubooquity/downloads/Ubooquity-${UBOOQUITY_VERSION}.zip" && \ unzip /tmp/ubooquity.zip -d /app/ubooquity && \
unzip /tmp/ubooquity.zip -d /app/ubooquity && \ echo "**** cleanup ****" && \
echo "**** cleanup ****" && \ apk del --purge \
apk del --purge \ build-dependencies && \
build-dependencies && \ rm -rf \
rm -rf \ /tmp/*
/tmp/*
# copy local files # copy local files
COPY root/ / COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 2202 2203 EXPOSE 2202 2203
VOLUME /books /comics /config /files
VOLUME /config

50
Dockerfile.armhf
Unescape View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13 FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@ -8,33 +8,33 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="sparklyballs" LABEL maintainer="sparklyballs"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies \
curl \ unzip && \
unzip && \ echo "**** install runtime packages ****" && \
echo "**** install runtime packages ****" && \ apk add --no-cache \
apk add --no-cache \ openjdk8-jre-base && \
openjdk8-jre-base && \ echo "**** install ubooquity ****" && \
echo "**** install ubooquity ****" && \ if [ -z ${UBOOQUITY_VERSION+x} ]; then \
if [ -z ${UBOOQUITY_VERSION+x} ]; then \ UBOOQUITY_VERSION=$(curl -IsL -w %{url_effective} -o /dev/null http://vaemendis.net/ubooquity/service/download.php \
UBOOQUITY_VERSION=$(curl -IsL -w %{url_effective} -o /dev/null http://vaemendis.net/ubooquity/service/download.php \ | sed 's|.*Ubooquity-\([0-9\.]*\).zip|\1|'); \
| sed 's|.*Ubooquity-\([0-9\.]*\).zip|\1|'); \ fi && \
fi && \ mkdir -p \
mkdir -p \ /app/ubooquity && \
/app/ubooquity && \ curl -o \
curl -o \ /tmp/ubooquity.zip -L \
/tmp/ubooquity.zip -L \ "http://vaemendis.net/ubooquity/downloads/Ubooquity-${UBOOQUITY_VERSION}.zip" && \
"http://vaemendis.net/ubooquity/downloads/Ubooquity-${UBOOQUITY_VERSION}.zip" && \ unzip /tmp/ubooquity.zip -d /app/ubooquity && \
unzip /tmp/ubooquity.zip -d /app/ubooquity && \ echo "**** cleanup ****" && \
echo "**** cleanup ****" && \ apk del --purge \
apk del --purge \ build-dependencies && \
build-dependencies && \ rm -rf \
rm -rf \ /tmp/*
/tmp/*
# copy local files # copy local files
COPY root/ / COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 2202 2203 EXPOSE 2202 2203
VOLUME /books /comics /config /files
VOLUME /config

1
README.md
Unescape View File

@ -251,6 +251,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **10.10.22:** - Rebasing to alpine 3.16, migrate to s6v3.
* **23.01.21:** - Rebasing to alpine 3.13. * **23.01.21:** - Rebasing to alpine 3.13.
* **01.06.20:** - Rebasing to alpine 3.12. * **01.06.20:** - Rebasing to alpine 3.12.
* **19.12.19:** - Rebasing to alpine 3.11. * **19.12.19:** - Rebasing to alpine 3.11.

1
readme-vars.yml
Unescape View File

@ -68,6 +68,7 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "10.10.22:", desc: "Rebasing to alpine 3.16, migrate to s6v3." }
- { date: "23.01.21:", desc: "Rebasing to alpine 3.13." } - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
- { date: "01.06.20:", desc: "Rebasing to alpine 3.12." } - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }

14
root/etc/cont-init.d/30-config
Unescape View File

@ -1,14 +0,0 @@
#!/usr/bin/with-contenv bash
# make our folders
mkdir -p \
config/fonts
# copy config
[[ ! -e /config/preferences.json ]] && \
cp /defaults/preferences.json /config/preferences.json
# permissions
chown -R abc:abc \
/config \
/app/ubooquity

0
root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-ubooquity-config
Unescape View File

0
root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/dependencies.d/init-config
Unescape View File

15
root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/run
Unescape View File

@ -0,0 +1,15 @@
#!/usr/bin/with-contenv bash
# make our folders
mkdir -p \
config/fonts
# copy config
if [[ ! -f /config/preferences.json ]]; then
cp /defaults/preferences.json /config/preferences.json
fi
# permissions
chown -R abc:abc \
/config \
/app/ubooquity

1
root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/type
Unescape View File

@ -0,0 +1 @@
oneshot

1
root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/up
Unescape View File

@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-ubooquity-config/run

0
root/etc/s6-overlay/s6-rc.d/svc-ubooquity/dependencies.d/init-services
Unescape View File

1
root/etc/s6-overlay/s6-rc.d/svc-ubooquity/notification-fd
Unescape View File

@ -0,0 +1 @@
3

10
root/etc/s6-overlay/s6-rc.d/svc-ubooquity/run
Unescape View File

@ -0,0 +1,10 @@
#!/usr/bin/with-contenv bash
JAVAMEM=${MAXMEM:-512}
exec \
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 2203" \
cd /app/ubooquity s6-setuidgid abc java -Xmx"$JAVAMEM"m \
-jar /app/ubooquity/Ubooquity.jar \
--headless --host 0.0.0.0 --remoteadmin \
--workdir /config

1
root/etc/s6-overlay/s6-rc.d/svc-ubooquity/type
Unescape View File

@ -0,0 +1 @@
longrun

0
root/etc/s6-overlay/s6-rc.d/user/contents.d/init-ubooquity-config
Unescape View File

0
root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-ubooquity
Unescape View File

11
root/etc/services.d/ubooquity/run
Unescape View File

@ -1,11 +0,0 @@
#!/usr/bin/with-contenv bash
JAVAMEM=${MAXMEM:-512}
cd /app/ubooquity || exit
exec \
s6-setuidgid abc java -Xmx"$JAVAMEM"m \
-jar /app/ubooquity/Ubooquity.jar \
--headless --host 0.0.0.0 --remoteadmin \
--workdir /config
Write Preview
Loading…
Cancel
Save