Skip to content

Commit

Permalink
Updating mirrobrain with fixes
Browse files Browse the repository at this point in the history
- using kiwix org now as this is settled
- installing the new zsync module
- removed the SQL data which is outdated and contains personnal info. Would do more harm than good.
- commenting out the SQL copy since there is no more SQL to copy
  • Loading branch information
rgaudin committed Oct 24, 2024
1 parent c585008 commit 444d548
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 31 deletions.
6 changes: 3 additions & 3 deletions mirrorbrain/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ LABEL maintainer="kiwix"

#Set software versions
ENV MB_VERSION 3.0.0
ENV MB_USER_OR_ORG kiwix

ENV LIBMAXMINDDB_VERSION 1.11.0
ENV MOD_MAXMINDDB_VERSION 1.2.0
Expand Down Expand Up @@ -45,7 +44,7 @@ RUN \

#Install MirrorBrain from sources
RUN \
wget --no-check-certificate -qO - https://github.com/$MB_USER_OR_ORG/mirrorbrain/archive/refs/tags/$MB_VERSION.tar.gz | tar -xz && \
wget --no-check-certificate -qO - https://github.com/kiwix/mirrorbrain/archive/refs/tags/$MB_VERSION.tar.gz | tar -xz && \
cd mirrorbrain-$MB_VERSION/mod_mirrorbrain && \
wget -q http://apache.webthing.com/svn/apache/forms/mod_form.h && \
wget -q http://apache.webthing.com/svn/apache/forms/mod_form.c && \
Expand All @@ -59,6 +58,7 @@ RUN \
install -m 755 null-rsync /usr/bin/null-rsync && \
install -m 755 scanner.pl /usr/bin/scanner && \
cd ../mirrorprobe/ && install -m 755 mirrorprobe.py /usr/bin/mirrorprobe && \
cd ../zsync/ && pip install --no-cache-dir --break-system-packages . && \
cd ../mb && pip install --no-cache-dir --break-system-packages . && \
cd ../assets && \
mkdir -p /var/www/static/flags && \
Expand All @@ -72,7 +72,7 @@ RUN chmod 0640 /etc/mirrorbrain.conf && chown root:mirrorbrain /etc/mirrorbrain
COPY config/apache/httpd-vhosts.conf conf/extra/httpd-vhosts.conf

#Copy SQL dumps
COPY ./sql/* mirrorbrain-$MB_VERSION/sql/
# COPY ./sql/* mirrorbrain-$MB_VERSION/sql/

#Install start script
COPY bin/* /usr/local/bin/
Expand Down
28 changes: 0 additions & 28 deletions mirrorbrain/sql/mirrors-postgresql.sql

This file was deleted.

0 comments on commit 444d548

Please sign in to comment.