Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backup-related changes #83

Merged
merged 2 commits into from
Feb 24, 2024
Merged

Backup-related changes #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb9b46e
Update docker-entrypoint.sh
sanikolaev Feb 24, 2024
cb9bf88
Update Dockerfile
sanikolaev Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ EXPOSE 9308
EXPOSE 9312
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
ENV MANTICORE_CONFIG="/etc/manticoresearch/manticore.conf.sh"
ENV MANTICORE_CONFIG="/etc/manticoresearch/manticore.conf.sh|/etc/manticoresearch/manticore.conf"
CMD ["searchd", "-c", "/etc/manticoresearch/manticore.conf.sh", "--nodetach"]

# How to build manually:
Expand Down
7 changes: 1 addition & 6 deletions docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,14 +241,9 @@ _main() {
fi

BACKUP_INIT_FOLDER="/docker-entrypoint-initdb.d"
INITED=""
for f in /var/lib/manticore/*; do
INITED=1
break
done

if [ -f "${BACKUP_INIT_FOLDER}/versions.json" ]; then
if [ -n "$INITED" ]; then
if [ -f /var/lib/manticore/manticore.json ]; then
echo "Warning: Backup is available for restore, but it's being skipped because it's already initialized or the data directory is not empty."
else
if [ ! -s "/usr/bin/manticore-executor" ]; then
Expand Down