Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Feeds
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Feeds
Commits
b6b63c7e
Verified
Commit
b6b63c7e
authored
3 months ago
by
cyrinux
Browse files
Options
Downloads
Patches
Plain Diff
feat: use ttrss cache s3 plugin instead of csi-s3
parent
076df311
Branches
tedomum
No related tags found
No related merge requests found
Pipeline
#34531
passed
3 months ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.docker/app/Dockerfile
+4
-1
4 additions, 1 deletion
.docker/app/Dockerfile
.docker/app/startup.sh
+4
-0
4 additions, 0 deletions
.docker/app/startup.sh
with
8 additions
and
1 deletion
.docker/app/Dockerfile
+
4
−
1
View file @
b6b63c7e
...
...
@@ -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
This diff is collapsed.
Click to expand it.
.docker/app/startup.sh
+
4
−
0
View file @
b6b63c7e
...
...
@@ -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."
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment