[planet-web/oscp] Use the bundled Planet Planet html5lib rather than the one provided by Debian buster
- From: Andrea Veri <averi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [planet-web/oscp] Use the bundled Planet Planet html5lib rather than the one provided by Debian buster
- Date: Wed, 20 Jan 2021 17:20:38 +0000 (UTC)
commit 474d4acd3126d0c0ffa392aed7e21789d1669ca1
Author: Andrea Veri <averi redhat com>
Date: Wed Jan 20 18:17:25 2021 +0100
Use the bundled Planet Planet html5lib rather than the one provided by Debian buster
The Debian Buster deb package [1] breaks utf-8 encoding for Planet Planet (Planet Venus), replace
with the bundled vendor copy. Fixes https://gitlab.gnome.org/Infrastructure/planet-web/-/issues/57.
[1] https://packages.debian.org/buster/planet-venus
Dockerfile | 4 +++-
update-planet | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/Dockerfile b/Dockerfile
index 5772edb8..325808ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,9 @@ RUN ln -sf /dev/stdout /var/log/nginx/access.log && \
RUN groupadd planet -g 1000510000 && useradd planet -g 1000510000 -u 1000510000 -r -l && \
git clone --depth 1 --branch master --single-branch https://gitlab.gnome.org/Infrastructure/planet-web
/planet && \
- chown -R 1000510000:100051000 /planet
+ git clone --depth 1 --branch master --single-branch https://github.com/rubys/venus /planet/venus && \
+ mkdir /planet/vendor && mv /planet/venus/vendor/html5lib /planet/vendor && rm -rf /planet/venus && \
+ chown -R 1000510000:100051000 /planet
RUN mkdir -p /var/cache/planet-venus/theme/common && \
cp -r /usr/share/planet-venus/theme/common/* /var/cache/planet-venus/theme/common/ && \
diff --git a/update-planet b/update-planet
index aece1e79..dbcb54db 100755
--- a/update-planet
+++ b/update-planet
@@ -1,3 +1,4 @@
#!/bin/bash
cd "/planet/config/$PLANET_NAME" || exit
+export PYTHONPATH=$PYTHONPATH:/planet/vendor
exec planet --verbose config.ini
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]