Merge pull request #41 from linuxserver/s6v3

pull/43/head
Adam 2 years ago committed by GitHub
commit ddd6ef1a99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

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

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

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

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

@ -68,6 +68,7 @@ app_setup_block: |
# changelog
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: "01.06.20:", desc: "Rebasing to alpine 3.12." }
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }

@ -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,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

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

@ -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,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
Loading…
Cancel
Save