Use single Dockerfile
This commit is contained in:
Theodoros Grammenos
parent
c16804a913
commit
ba293fbf69
14
Dockerfile
14
Dockerfile
|
|
@ -2,8 +2,8 @@ FROM debian:bullseye
|
|||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
ARG S6_OVERLAY_VERSION=3.1.3.0
|
||||
ARG S6_OVERLAY_ARCH="x86_64"
|
||||
ARG KOHA_VERSION=22.11
|
||||
ARG TARGETARCH
|
||||
|
||||
LABEL org.opencontainers.image.source=https://github.com/teorgamm/koha-docker
|
||||
|
||||
|
|
@ -19,8 +19,14 @@ RUN apt-get update \
|
|||
|
||||
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
|
||||
RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
|
||||
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz /tmp
|
||||
RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
|
||||
|
||||
RUN echo ${TARGETARCH} && case ${TARGETARCH} in \
|
||||
"amd64") S6_ARCH=x86_64 ;; \
|
||||
"arm64") S6_ARCH=aarch64 ;; \
|
||||
"arm") S6_ARCH=armhf ;; \
|
||||
esac \
|
||||
&& 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/ && \
|
||||
wget -qO - https://debian.koha-community.org/koha/gpg.asc | gpg --dearmor -o /etc/apt/keyrings/koha.gpg && \
|
||||
|
|
@ -45,7 +51,7 @@ RUN a2enmod rewrite \
|
|||
&& mkdir -p /var/log/koha/apache \
|
||||
&& chown -R www-data:www-data /var/log/koha/apache
|
||||
|
||||
COPY --chown 0:0 files/ /
|
||||
COPY --chown=0:0 files/ /
|
||||
WORKDIR /docker
|
||||
|
||||
EXPOSE 2100 6001 8080 8081
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
FROM debian:bullseye
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
ARG S6_OVERLAY_VERSION=3.1.3.0
|
||||
ARG S6_OVERLAY_ARCH="aarch64"
|
||||
ARG KOHA_VERSION=22.11
|
||||
|
||||
LABEL org.opencontainers.image.source=https://github.com/teorgamm/koha-docker
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y \
|
||||
wget \
|
||||
apache2 \
|
||||
gnupg2 \
|
||||
apt-transport-https \
|
||||
xz-utils \
|
||||
&& rm -rf /var/cache/apt/archives/* \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
|
||||
RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
|
||||
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz /tmp
|
||||
RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
|
||||
|
||||
RUN mkdir /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
|
||||
|
||||
# Install Koha
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y koha-core \
|
||||
idzebra-2.0 \
|
||||
apache2 libapache2-mpm-itk\
|
||||
logrotate \
|
||||
&& rm -rf /var/cache/apt/archives/* \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN a2enmod rewrite \
|
||||
&& a2enmod headers \
|
||||
&& a2enmod proxy_http \
|
||||
&& a2enmod cgi \
|
||||
&& a2dissite 000-default \
|
||||
&& echo "Listen 8081\nListen 8080" > /etc/apache2/ports.conf \
|
||||
&& sed -E -i "s#^(export APACHE_LOG_DIR=).*#\1/var/log/koha/apache#g" /etc/apache2/envvars \
|
||||
&& mkdir -p /var/log/koha/apache \
|
||||
&& chown -R www-data:www-data /var/log/koha/apache
|
||||
|
||||
COPY --chown 0:0 files/ /
|
||||
WORKDIR /docker
|
||||
|
||||
EXPOSE 2100 6001 8080 8081
|
||||
|
||||
CMD [ "/init" ]
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
FROM debian:bullseye
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
ARG S6_OVERLAY_VERSION=3.1.3.0
|
||||
ARG S6_OVERLAY_ARCH="armhf"
|
||||
ARG KOHA_VERSION=22.11
|
||||
|
||||
LABEL org.opencontainers.image.source=https://github.com/teorgamm/koha-docker
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y \
|
||||
wget \
|
||||
apache2 \
|
||||
gnupg2 \
|
||||
apt-transport-https \
|
||||
xz-utils \
|
||||
&& rm -rf /var/cache/apt/archives/* \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
|
||||
RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
|
||||
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz /tmp
|
||||
RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
|
||||
|
||||
RUN mkdir /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
|
||||
|
||||
# Install Koha
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y koha-core \
|
||||
idzebra-2.0 \
|
||||
apache2 libapache2-mpm-itk\
|
||||
logrotate \
|
||||
&& rm -rf /var/cache/apt/archives/* \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN a2enmod rewrite \
|
||||
&& a2enmod headers \
|
||||
&& a2enmod proxy_http \
|
||||
&& a2enmod cgi \
|
||||
&& a2dissite 000-default \
|
||||
&& echo "Listen 8081\nListen 8080" > /etc/apache2/ports.conf \
|
||||
&& sed -E -i "s#^(export APACHE_LOG_DIR=).*#\1/var/log/koha/apache#g" /etc/apache2/envvars \
|
||||
&& mkdir -p /var/log/koha/apache \
|
||||
&& chown -R www-data:www-data /var/log/koha/apache
|
||||
|
||||
COPY --chown 0:0 files/ /
|
||||
WORKDIR /docker
|
||||
|
||||
EXPOSE 2100 6001 8080 8081
|
||||
|
||||
CMD [ "/init" ]
|
||||
Loading…
Reference in a new issue