diff --git a/Dockerfile.template b/Dockerfile.template index fbda984..9e21dc3 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -26,32 +26,16 @@ RUN mkdir -p /usr/src/kiwix \ && mv /usr/src/kiwix/$BIN/* /usr/bin/ \ && rm -rf /usr/src/kiwix -# Install httrack -RUN apk add --update -t build-deps build-base zlib-dev openssl-dev \ - && wget -O - https://github.com/xroche/httrack/archive/3.48.21.tar.gz \ - | tar -C /usr/src -xzf - \ - && cd /usr/src/httrack-3.48.21 \ - && ./configure \ - && make -j8 \ - && make install \ - && apk add --update hostapd dnsmasq s6 nginx openssh py-pip python \ +RUN apk add --update hostapd dnsmasq s6 nginx openssh py-pip python \ usb-modeswitch \ + && pip install --upgrade pip \ && sed -i 's/#PermitRootLogin.*/PermitRootLogin\ yes/' \ /etc/ssh/sshd_config \ && pip install ka-lite \ + && mkdir /data \ && adduser -h /data/kalite kalite -D \ - && apk del build-deps \ && rm -rf /root/.cache/ /usr/src/* -# Mirror Websites -ENV SITES http://elpissite.weebly.com http://elpissite2.weebly.com -RUN mkdir -p /content/www \ - && cd /content/www \ - && httrack --near --disable-security-limits --max-rate 0 \ - --connection-per-second 100 $SITES \ - && find . -type f -maxdepth 1 -delete \ - && rm -rf hts-cache - # Go-Questionaire RUN apk add -t build-deps --update go git libc-dev \ && export GOPATH=/opt/go \ @@ -64,10 +48,10 @@ RUN apk add -t build-deps --update go git libc-dev \ && adduser -h /opt/questionnaire elpis -D # Digital Hub -ENV DH_REV=65103cf4a -RUN mkdir /content/www/digital-hub \ +ENV DH_REV=9829de9 +RUN mkdir -p /content/digital-hub \ && wget -O - https://github.com/ElpisSolar/digital-hub/archive/${DH_REV}.tar.gz \ - | tar --strip-components 1 -C /content/www/digital-hub -xzf - + | tar --strip-components 1 -C /content/digital-hub -xzf - VOLUME [ "/data" ] diff --git a/files/content/index.html b/files/content/index.html index 8ea1e5e..5d2d740 100644 --- a/files/content/index.html +++ b/files/content/index.html @@ -11,7 +11,6 @@
Welcome to our digital library. Here you can access a collection of free e-books and educational content.
@@ -22,8 +21,7 @@