diff --git a/inventaire/Dockerfile.inventaire b/inventaire/Dockerfile.inventaire index ec4269f..06bc8ce 100644 --- a/inventaire/Dockerfile.inventaire +++ b/inventaire/Dockerfile.inventaire @@ -16,8 +16,8 @@ WORKDIR /opt/inventaire ARG GIT_REF=main ENV DOCKER=1 -# - Create the client folder to prevent the server postinstall to run `npm run install-client` as it does it with the wrong workdir and env -# - Create the public/sitemaps folder to prevent the client postinstall to run `npm run generate-sitemaps` (which needs to be updated to support non-inventaire.io instances) +# - Create the client directory to prevent the server postinstall to run `npm run install-client` as it does it with the wrong workdir and env +# - Create the public/sitemaps directory to prevent the client postinstall to run `npm run generate-sitemaps` (which needs to be updated to support non-inventaire.io instances) RUN git clone https://git.inventaire.io/inventaire --depth 1 --branch "${GIT_REF}" . \ && mkdir -p /opt/inventaire/client \ && npm ci --omit=dev \ diff --git a/inventaire/docker-entrypoint.sh b/inventaire/docker-entrypoint.sh index a6bc2a7..3b27b4a 100755 --- a/inventaire/docker-entrypoint.sh +++ b/inventaire/docker-entrypoint.sh @@ -21,10 +21,10 @@ module.exports = { username: '${COUCHDB_USER}', password: '${COUCHDB_PASSWORD}', hostname: 'couchdb', - backupFolder: '/opt/inventaire_backups', + backupDirectory: '/opt/inventaire_backups', }, leveldb: { - folder: '/opt/inventaire_leveldb' + directory: '/opt/inventaire_leveldb' }, elasticsearch: { origin: 'http://elasticsearch:9200', @@ -58,7 +58,7 @@ module.exports = { region: '${SWIFT_REGION}', }, local: { - folder: '/opt/inventaire_local_media_storage' + directory: '/opt/inventaire_local_media_storage' }, },