update debian/Dockerfile

contrib/debootstrap.sh

@@ -40,9 +40,14 @@ EOF
 sudo sh <<EOF
 umount -f "${dest}/proc"
 umount -f "${dest}/sys"
+umount -f "${dest}/dev"
 
+mkdir -p "${dest}/proc"
 mount proc "${dest}"/proc -t proc
+mkdir -p "${dest}/sys"
 mount sysfs "${dest}"/sys -t sysfs
+mkdir -p "${dest}/dev"
+mount /dev "${dest}"/dev -o bind
 #mount -o bind "${CACHEDIR}" "${dest}/var/cache/apt/archives"
 chmod 0755 "${dest}/fix.sh"
 
@@ -51,6 +56,7 @@ chroot "${dest}" ./fix.sh
 #umount "${dest}/var/cache/apt/archives"
 umount "${dest}"/proc
 umount "${dest}"/sys
+umount "${dest}"/dev
 EOF
 
 sudo rm "${dest}/fix.sh" 

contrib/nspawn.sh

@@ -1,3 +1,5 @@
 #!/bin/sh
-${AGOSTLE_BIN:=~/bin}
+set -eu
+echo AGOSTLE_BIN=${AGOSTLE_BIN:=~/bin}
+set -x
 exec sudo systemd-nspawn "--image=${SQFS:-./agostle.sqfs}" -a --suppress-sync=true --volatile=overlay "--bind=${AGOSTLE_BIN}:/app/bin" --chdir=/app /app/bin/agostle "$@"

docks/alpine/Dockerfile

@@ -8,10 +8,12 @@ MAINTAINER Tamás Gulácsi <[email protected]>
 
 #COPY --from=builder agostle /app/bin/agostle
 RUN apk -U upgrade
-RUN apk add ttf-dejavu ttf-liberation font-noto font-noto-emoji
+RUN apk add font-dejavu font-liberation font-noto font-noto-emoji font-carlito
+#RUN apt-get -y install fonts-sil-gentium fonts-takao-mincho  fonts-crosextra-caladea # K-MT16579
 RUN apk add msttcorefonts-installer 
 RUN update-ms-fonts 
 RUN fc-cache -f
+RUN apk add file
 # https://stackoverflow.com/questions/25193161/chfn-pam-system-error-intermittently-in-docker-hub-builds
 RUN ln -sf /bin/true /usr/bin/chfn
 # Missing:
@@ -40,4 +42,4 @@ WORKDIR /app
 EXPOSE 9500:9500
 VOLUME ["/app/bin"]
 ENTRYPOINT ["/bin/sh", "-c"]
-CMD ["/app/bin/agostle serve 0.0.0.0:9500"]
+CMD ["rm -rf --one-file-system /tmp/*; /app/bin/agostle serve 0.0.0.0:9500"]

docks/debian/Dockerfile

@@ -2,13 +2,14 @@ FROM debian:testing
 MAINTAINER Tamás Gulácsi <[email protected]>
 
 ENV DEBIAN_FRONTEND=noninteractive
-RUN echo 'deb http://httpredir.debian.org/debian testing main contrib non-free' >/etc/apt/sources.list
+RUN echo 'deb http://debian-archive.trafficmanager.net/debian testing main contrib non-free' >/etc/apt/sources.list
 RUN apt-get -y update && apt-get -y upgrade
 # https://stackoverflow.com/questions/25193161/chfn-pam-system-error-intermittently-in-docker-hub-builds
 RUN ln -sf /bin/true /usr/bin/chfn
 
 RUN apt-get -y --no-install-recommends --no-install-suggests install libreoffice
-RUN apt-get -y install wkhtmltopdf
+RUN echo 'deb http://debian-archive.trafficmanager.net/debian bullseye main contrib non-free' >>/etc/apt/sources.list && apt-get -y update
+RUN apt-get -y install --no-install-recommends --no-install-suggests libqt5svg5 wkhtmltopdf
 RUN apt-get -y install ghostscript graphicsmagick 
 RUN apt-get -y install pdftk poppler-utils mupdf-tools 
 RUN apt-get -y purge liblog4j1.2-java
@@ -20,7 +21,7 @@ RUN apt-get -y install fonts-sil-gentium fonts-dejavu-extra fonts-liberation fon
 RUN apt-get -y install fonts-crosextra-caladea fonts-crosextra-carlito  # K-MT16579
 RUN apt-get -y install file 
 
-RUN find / -type f -name 'log4j-1*.jar' -print
+RUN find / -mount -type f -name 'log4j-1*.jar' -print
 #RUN find / -type f -name 'log4j-1*.jar' -delete
 
 #RUN addgroup --quiet --gid 10507 agostle