From 404caed4ece02eae937560c944d64b43ff30edda Mon Sep 17 00:00:00 2001 From: Gavin Morris Date: Wed, 19 Oct 2022 06:39:41 -0400 Subject: [PATCH] Issue 224 Fixed - Dead code removed (#241) * Issue 224 Fixed - Dead code removed * Issue 224 Fixed - Dead code removed and Milliner README fixed --- hypercube/Dockerfile | 4 +--- hypercube/README.md | 3 +-- .../rootfs/etc/confd/templates/config.yaml.tmpl | 2 -- milliner/README.md | 12 ++++++------ 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/hypercube/Dockerfile b/hypercube/Dockerfile index 681c3e9e..f7fca306 100644 --- a/hypercube/Dockerfile +++ b/hypercube/Dockerfile @@ -29,9 +29,7 @@ RUN --mount=type=cache,id=hypercube-apk,sharing=locked,from=cache,target=/var/ca addgroup nginx jwt && \ cleanup.sh -ENV \ - HYPERCUBE_FCREPO_URL=fcrepo/fcrepo/rest \ - HYPERCUBE_LOG_LEVEL=info +ENV HYPERCUBE_LOG_LEVEL=info COPY --from=crayfish /etc/nginx/http.d/default.conf /etc/nginx/http.d/default.conf COPY --from=crayfish --chown=nginx:nginx /var/www /var/www diff --git a/hypercube/README.md b/hypercube/README.md index 5da1b29f..0cf0e949 100644 --- a/hypercube/README.md +++ b/hypercube/README.md @@ -10,9 +10,8 @@ additional settings, volumes, ports, etc. ## Settings -| Environment Variable | Confd Key | Default | Description | +| Environment Variable | Confd Key | Default | Description | | :------------------- | :-------------------- | :----------------- | :------------------------------------------------------------------------------------------------ | -| HYPERCUBE_FCREPO_URL | /hypercube/fcrepo/url | fcrepo/fcrepo/rest | Fcrepo Rest API URL | | HYPERCUBE_LOG_LEVEL | /hypercube/log/level | debug | Log level. Possible Values: debug, info, notice, warning, error, critical, alert, emergency, none | [Hypercube]: https://github.com/Islandora/Crayfish/tree/main/Hypercube diff --git a/hypercube/rootfs/etc/confd/templates/config.yaml.tmpl b/hypercube/rootfs/etc/confd/templates/config.yaml.tmpl index 1bb12fc2..6c2231c0 100644 --- a/hypercube/rootfs/etc/confd/templates/config.yaml.tmpl +++ b/hypercube/rootfs/etc/confd/templates/config.yaml.tmpl @@ -3,8 +3,6 @@ hypercube: # path to the convert executable tesseract_executable: tesseract pdftotext_executable: pdftotext -fedora_resource: - base_url: {{ getenv "HYPERCUBE_FCREPO_URL" }} log: # Valid log levels are: # debug, info, notice, warning, error, critical, alert, emergency, none diff --git a/milliner/README.md b/milliner/README.md index 1deb69ba..19d25506 100644 --- a/milliner/README.md +++ b/milliner/README.md @@ -10,11 +10,11 @@ additional settings, volumes, ports, etc. ## Settings -| Environment Variable | Confd Key | Default | Description | -| :------------------- | :------------------- | :----------------- | :------------------------------------------------------------------------------------------------ | -| MILLINER_DRUPAL_URL | /milliner/drupal/url | drupal:80 | Drupal URL | -| MILLINER_FCREPO_URL | /milliner/fcrepo/url | fcrepo/fcrepo/rest | Fcrepo Rest API URL | -| MILLINER_FCREPO6 | /milliner/fcrepo6 | false | Set to "true" if using Fedora 6 and set to "false" if using Fedora 4 or 5 | -| MILLINER_LOG_LEVEL | /milliner/log/level | debug | Log level. Possible Values: debug, info, notice, warning, error, critical, alert, emergency, none | +| Environment Variable | Confd Key | Default | Description | +| :------------------- | :------------------- | :---------------------- | :------------------------------------------------------------------------------------------------ | +| MILLINER_DRUPAL_URL | /milliner/drupal/url | drupal:80 | Drupal URL | +| MILLINER_FCREPO_URL | /milliner/fcrepo/url | fcrepo:8080/fcrepo/rest | Fcrepo Rest API URL | +| MILLINER_FCREPO6 | /milliner/fcrepo6 | false | Set to "true" if using Fedora 6 and set to "false" if using Fedora 4 or 5 | +| MILLINER_LOG_LEVEL | /milliner/log/level | debug | Log level. Possible Values: debug, info, notice, warning, error, critical, alert, emergency, none | [Milliner]: https://github.com/Islandora/Crayfish/tree/main/Milliner