diff --git a/Dockerfile b/Dockerfile index 38e6e0c..a70e79f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.16 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine:3.17 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 69daf5e..510c3cc 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 5ac6251..c4e0a82 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17 # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index aa0e55f..ab3901f 100644 --- a/README.md +++ b/README.md @@ -94,12 +94,12 @@ services: - PUID=1000 - PGID=1000 - TZ=Etc/UTC - - MAXMEM= + - MAXMEM= volumes: - - :/config - - :/books - - :/comics - - :/files + - /path/to/data:/config + - /path/to/books:/books + - /path/to/comics:/comics + - /path/to/raw/files:/files ports: - 2202:2202 - 2203:2203 @@ -114,13 +114,13 @@ docker run -d \ -e PUID=1000 \ -e PGID=1000 \ -e TZ=Etc/UTC \ - -e MAXMEM= \ + -e MAXMEM= \ -p 2202:2202 \ -p 2203:2203 \ - -v :/config \ - -v :/books \ - -v :/comics \ - -v :/files \ + -v /path/to/data:/config \ + -v /path/to/books:/books \ + -v /path/to/comics:/comics \ + -v /path/to/raw/files:/files \ --restart unless-stopped \ lscr.io/linuxserver/ubooquity:latest @@ -137,7 +137,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | -| `-e MAXMEM=` | To set the maximum memory. ( ex: set '1024' for 1GB ) | +| `-e MAXMEM=` | To set the maximum memory. ( ex: set '1024' for 1GB ) | | `-v /config` | Config files and database for ubooquity. | | `-v /books` | Location of books. | | `-v /comics` | Location of comics. | @@ -252,6 +252,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **05.03.23:** - Rebase to Alpine 3.17. * **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. diff --git a/readme-vars.yml b/readme-vars.yml index c6f458c..910d2b2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -24,13 +24,13 @@ param_usage_include_net: false param_usage_include_env: true param_env_vars: - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } - - { env_var: "MAXMEM", env_value: "", desc: "To set the maximum memory. ( ex: set '1024' for 1GB )" } + - { env_var: "MAXMEM", env_value: "", desc: "To set the maximum memory. ( ex: set '1024' for 1GB )" } param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "", desc: "Config files and database for ubooquity." } - - { vol_path: "/books", vol_host_path: "", desc: "Location of books." } - - { vol_path: "/comics", vol_host_path: "", desc: "Location of comics." } - - { vol_path: "/files", vol_host_path: "", desc: "Location of raw files." } + - { vol_path: "/config", vol_host_path: "/path/to/data", desc: "Config files and database for ubooquity." } + - { vol_path: "/books", vol_host_path: "/path/to/books", desc: "Location of books." } + - { vol_path: "/comics", vol_host_path: "/path/to/comics", desc: "Location of comics." } + - { vol_path: "/files", vol_host_path: "/path/to/raw/files", desc: "Location of raw files." } param_usage_include_ports: true param_ports: - { external_port: "2202", internal_port: "2202", port_desc: "The library port." } @@ -68,6 +68,7 @@ app_setup_block: | # changelog changelogs: + - { date: "05.03.23:", desc: "Rebase to Alpine 3.17." } - { 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." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/run b/root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/run index 9489de0..a0c893b 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/run @@ -1,8 +1,9 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash # make our folders mkdir -p \ - config/fonts + /config/fonts # copy config if [[ ! -f /config/preferences.json ]]; then @@ -10,6 +11,5 @@ if [[ ! -f /config/preferences.json ]]; then fi # permissions -chown -R abc:abc \ - /config \ - /app/ubooquity +lsiown -R abc:abc \ + /config diff --git a/root/etc/s6-overlay/s6-rc.d/svc-ubooquity/run b/root/etc/s6-overlay/s6-rc.d/svc-ubooquity/run index caaa581..9568874 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-ubooquity/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-ubooquity/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash JAVAMEM=${MAXMEM:-512}