From b6b63c7e88a8738bf7558726a0010ada243ddeb9 Mon Sep 17 00:00:00 2001
From: Cyril Levis <git@levis.name>
Date: Sun, 24 Nov 2024 10:23:03 +0100
Subject: [PATCH] feat: use ttrss cache s3 plugin instead of csi-s3
---
.docker/app/Dockerfile | 5 ++++-
.docker/app/startup.sh | 4 ++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile
index 3d3ad4fd8..3cd2cecfb 100644
--- a/.docker/app/Dockerfile
+++ b/.docker/app/Dockerfile
@@ -65,6 +65,9 @@ RUN git clone --depth=1 ${ORIGIN_REPO_SMTP} ${SRC_DIR}/plugins.local/mailer_smtp
ARG ORIGIN_REPO_MASTODON=https://framagit.org/framasoft/ttrss/ttrss_mastodon.git
RUN git clone --depth=1 ${ORIGIN_REPO_MASTODON} ${SRC_DIR}/plugins.local/mastodon
+ARG ORIGIN_REPO_CACHE_S3=https://git.tt-rss.org/fox/ttrss-cache-s3.git
+RUN git clone --depth=1 ${ORIGIN_REPO_CACHE_S3} ${SRC_DIR}/plugins.local/cache_s3
+
ENV OWNER_UID=1000
ENV OWNER_GID=1000
@@ -103,6 +106,6 @@ ENV TTRSS_DB_PORT="5432"
ENV TTRSS_MYSQL_CHARSET="UTF8"
ENV TTRSS_PHP_EXECUTABLE="/usr/bin/php83"
-ENV TTRSS_PLUGINS="auth_internal, note, nginx_xaccel, mailer_smtp, data_migration"
+ENV TTRSS_PLUGINS="cache_s3, auth_internal, note, nginx_xaccel, mailer_smtp, data_migration"
CMD ${SCRIPT_ROOT}/startup.sh
diff --git a/.docker/app/startup.sh b/.docker/app/startup.sh
index 6063d9281..a8e3c3fac 100644
--- a/.docker/app/startup.sh
+++ b/.docker/app/startup.sh
@@ -60,6 +60,10 @@ if [ -z $SKIP_RSYNC_ON_STARTUP ]; then
sudo -u app rsync -a --no-owner --delete \
$SRC_DIR/plugins.local/data_migration \
$DST_DIR/plugins.local/data_migration
+
+ sudo -u app rsync -a --no-owner --delete \
+ $SRC_DIR/plugins.local/cache_s3 \
+ $DST_DIR/plugins.local/cache_s3
fi
else
echo "warning: working copy in $DST_DIR won't be updated, make sure you know what you're doing."
--
GitLab