diff --git a/CHANGELOG.md b/CHANGELOG.md index 61f9065db41e1fbc337a0dc6ad48593a85a094a3..e3c3242fea7d86d8515d942b1ba6e3e2e1ea5610 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.9.3] - 2020-09-18 + +## Changed + +- The data directory of eXist-db is mounted to a volume instead of a bind mount. + +## Fixed + +- The maximum amount of memory usable by eXist-db's Docker container has been reduced to 1GB. + ## [1.9.2] - 2020-09-10 ## Changed diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index cf00749e22b19f719d3d9179761577c9b1957a03..16f3a4b4b302eedb38b35ba9c0690c08a0e82f33 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,4 +1,9 @@ -version: '3' +version: '3.4' + +volumes: + existdb_data: + name: ahikar-existdb_Data-${TAG} + services: existdb: build: @@ -8,6 +13,7 @@ services: entrypoint: - java - -javaagent:/prometheus/jmx_prometheus_javaagent-0.12.0.jar=8079:/prometheus/jmx_prometheus_config.yaml + - -Xmx1g - org.exist.start.Main - jetty ports: @@ -20,13 +26,18 @@ services: environment: - APP_NAME=${APP_NAME} volumes: - # TODO: The index of the database at ./exist/data is corrupt on - # the test instance but cannot be deleted. - # Until October 1, 2020 we temporarily create a new bind mount, - # exist_2, to get a running database on the test server. - - ${EXIST_HOST_DIR}:/exist/data:z - - ${EXIST_HOST_DIR}/logs:/exist/logs:z - - ./prometheus:/prometheus:z + # eXist's data should be persistent but easily removable if the + # database's index is broken for some reason. Therefore we put + # it in a volume instead of a bind mount. + - type: volume + source: existdb_data + target: /exist/data + - type: bind + source: ./exist/logs + target: /exist/logs + - type: bind + source: ./prometheus + target: /prometheus httpd: build: diff --git a/docker/set-env-for-docker-compose.sh b/docker/set-env-for-docker-compose.sh index d4bd7281b5858e18db3c3a0f8fb7f5f1061fdb62..4c7217ed2c99b221f0edcff6cec7a2d2d33bec0b 100755 --- a/docker/set-env-for-docker-compose.sh +++ b/docker/set-env-for-docker-compose.sh @@ -9,18 +9,15 @@ case ${CI_COMMIT_REF_NAME} in echo "PORT=8092" >> docker/.env echo "TAG=release" >> docker/.env echo "APP_NAME=https://ahikar.sub.uni-goettingen.de/" >> docker/.env - echo "EXIST_HOST_DIR=./exist/data" >> docker/.env ;; "develop") echo "PORT=8093" > docker/.env echo "TAG=develop" >> docker/.env echo "APP_NAME=https://ahikar-dev.sub.uni-goettingen.de/" >> docker/.env - echo "EXIST_HOST_DIR=./exist/data" >> docker/.env ;; *) echo "PORT=8094" > docker/.env echo "TAG=testing" >> docker/.env echo "APP_NAME=https://ahikar-test.sub.uni-goettingen.de/" >> docker/.env - echo "EXIST_HOST_DIR=./exist_2/data" >> docker/.env ;; esac diff --git a/exist-app/build.properties b/exist-app/build.properties index 7eee5ac0ed6724024a27ca0d454c2d808956d92c..b0d32c10fb5637975f893bc280af5c79532515e2 100644 --- a/exist-app/build.properties +++ b/exist-app/build.properties @@ -1,5 +1,5 @@ project.name=https://ahikar-test.sub.uni-goettingen.de/ -project.version=1.9.2 +project.version=1.9.3 project.title=TextAPI for Ahikar project.abbrev=ahikar-test project.processorversion=5.2.0