diff --git a/Dockerfile b/Dockerfile index 2c3bdc7..4e03f18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM debian:bullseye +FROM debian:bookworm ENV DEBIAN_FRONTEND noninteractive -ARG S6_OVERLAY_VERSION=3.1.3.0 -ARG KOHA_VERSION=22.11 +ARG S6_OVERLAY_VERSION=3.2.0.2 +ARG KOHA_VERSION=24.11 ARG TARGETARCH LABEL org.opencontainers.image.source=https://github.com/teorgamm/koha-docker @@ -28,7 +28,7 @@ RUN echo ${TARGETARCH} && case ${TARGETARCH} in \ && wget -P /tmp/ -q https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz \ && tar -C / -Jxpf /tmp/s6-overlay-${S6_ARCH}.tar.xz -RUN mkdir /etc/apt/keyrings/ && \ +RUN mkdir -p /etc/apt/keyrings/ && \ wget -qO - https://debian.koha-community.org/koha/gpg.asc | gpg --dearmor -o /etc/apt/keyrings/koha.gpg && \ echo "deb [signed-by=/etc/apt/keyrings/koha.gpg] https://debian.koha-community.org/koha ${KOHA_VERSION} main bullseye" | tee /etc/apt/sources.list.d/koha.list diff --git a/README.md b/README.md index ad2b953..f854789 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # koha-docker -![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/teogramm/koha/22.11) +![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/teogramm/koha/latest) A Koha Docker container which includes: * The Apache webserver serving the OPAC (Port 8080) and diff --git a/examples/docker-compose.yaml b/examples/docker-compose.yaml index 4ba58b6..9876bb4 100644 --- a/examples/docker-compose.yaml +++ b/examples/docker-compose.yaml @@ -1,7 +1,7 @@ version: "3.9" services: koha: - image: teogramm/koha:22.11 + image: teogramm/koha:24.11 ports: - 8080:8080 - 8081:8081 diff --git a/files/etc/s6-overlay/s6-rc.d/worker/run b/files/etc/s6-overlay/s6-rc.d/worker/run index 2a4b85c..844a57c 100755 --- a/files/etc/s6-overlay/s6-rc.d/worker/run +++ b/files/etc/s6-overlay/s6-rc.d/worker/run @@ -6,4 +6,4 @@ s6-envdir /etc/koha-envvars s6-setuidgid default-koha -/usr/bin/perl /usr/share/koha/bin/background_jobs_worker.pl +/usr/bin/perl /usr/share/koha/bin/workers/background_jobs_worker.pl