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.

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

DOCKER-458 fix restore from backup shell script check #111

Merged
merged 1 commit into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,12 @@ There are several environment variables available to tweak the behaviour. The va

`shared.properties` can be set via a generic mechanism by setting environment variables of the form SHARED\_\<parameter\>.

A subset of the properties have also dedicated environment variables e.g. ALFRESCO_ENABLE_TRACKING. Generic variables take precedence.
A subset of the properties have also dedicated environment variables e.g. ALFRESCO_ENABLE_TRACKING. Generic variables
take precedence.

See also environment variables from lower layers: [`docker-openjdk`](https://github.com/xenit-eu/docker-openjdk) and [`docker-tomcat`](https://github.com/xenit-eu/docker-tomcat) and - for Xenit-specific images - [`alfred-telemetry`](https://github.com/xenit-eu/alfred-telemetry/tree/master/alfred-telemetry-solr)
See also environment variables from lower layers: [`docker-openjdk`](https://github.com/xenit-eu/docker-openjdk)
and [`docker-tomcat`](https://github.com/xenit-eu/docker-tomcat) and - for Xenit-specific
images - [`alfred-telemetry`](https://github.com/xenit-eu/alfred-telemetry/tree/master/alfred-telemetry-solr)

| Variable | solrcore.property variable | java variable | Default | Comments |
|--------------------------------------------|---------------------------------|---------------|----------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
Expand Down Expand Up @@ -83,6 +86,7 @@ See also environment variables from lower layers: [`docker-openjdk`](https://git
| \* SSL_TRUST_STORE_PASSWORD | | | kT9X6oe68t | |
| JSON_LOGGING | | | false | if true, sets the application logs in JSON format |
| ACCESS_LOGGING | | | false | if true, sets the access logs in JSON format |
| RESTORE_FROM_BACKUP | | | empty(false) | if true, starts the process of restoring from s3 backup |

\* = tested for solr6

Expand Down
2 changes: 1 addition & 1 deletion xenit/solr6/local/93-restore-from-backup.sh
WimCrols marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ set -e

echo "Solr restore from backup start"

if [ -z "${RESTORE_FROM_BACKUP}" ]; then
if [ -z "${RESTORE_FROM_BACKUP}" ] || [ "${RESTORE_FROM_BACKUP}" != "true" ]; then
hechmi-dammak-xenit marked this conversation as resolved.
Show resolved Hide resolved
echo "No index backup restore requested, exiting"
else
# Check if the index properties file exists , it means previous restore already happened
Expand Down
Loading