Skip to content

Commit

Permalink
Fix logging errors with cantaloupe due to find/replace bug (#165)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nigelgbanks
nigelgbanks authored Nov 23, 2021
1 parent fc5c56c commit 1345d80
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 36 deletions.
42 changes: 21 additions & 21 deletions cantaloupe/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ ENV \
CANTALOUPE_FFMPEGPROCESSOR_PATH_TO_BINARIES= \
CANTALOUPE_FILESYSTEMCACHE_DIR_DEPTH="3" \
CANTALOUPE_FILESYSTEMCACHE_DIR_NAME_LENGTH="2" \
CANTALOUPE_FILESYSTEMCACHE_PATHNAME="_data" \
CANTALOUPE_FILESYSTEMSOURCE_BASICLOOKUPSTRATEGY_PATH_PREFIX="_var_www_drupal_web_" \
CANTALOUPE_FILESYSTEMCACHE_PATHNAME="/data" \
CANTALOUPE_FILESYSTEMSOURCE_BASICLOOKUPSTRATEGY_PATH_PREFIX="/var/www/drupal/web/" \
CANTALOUPE_FILESYSTEMSOURCE_BASICLOOKUPSTRATEGY_PATH_SUFFIX= \
CANTALOUPE_FILESYSTEMSOURCE_LOOKUP_STRATEGY="BasicLookupStrategy" \
CANTALOUPE_HEAPCACHE_PERSIST="false" \
CANTALOUPE_HEAPCACHE_PERSIST_FILESYSTEM_PATHNAME="_var_cache_cantaloupe_heap.cache" \
CANTALOUPE_HEAPCACHE_PERSIST_FILESYSTEM_PATHNAME="/var/cache/cantaloupe/heap.cache" \
CANTALOUPE_HEAPCACHE_TARGET_SIZE="2G" \
CANTALOUPE_HTTP_ENABLED="true" \
CANTALOUPE_HTTP_HOST="0.0.0.0" \
Expand All @@ -109,7 +109,7 @@ ENV \
CANTALOUPE_HTTPS_HOST="0.0.0.0" \
CANTALOUPE_HTTPS_KEY_PASSWORD="password" \
CANTALOUPE_HTTPS_KEY_STORE_PASSWORD="password" \
CANTALOUPE_HTTPS_KEY_STORE_PATH="_path_to_keystore.jks" \
CANTALOUPE_HTTPS_KEY_STORE_PATH="/path/to/keystore.jks" \
CANTALOUPE_HTTPS_KEY_STORE_TYPE="JKS" \
CANTALOUPE_HTTPS_PORT="8183" \
CANTALOUPE_HTTPSOURCE_ALLOW_INSECURE="false" \
Expand All @@ -127,54 +127,54 @@ ENV \
CANTALOUPE_JDBCCACHE_DERIVATIVE_IMAGE_TABLE="derivative_cache" \
CANTALOUPE_JDBCCACHE_INFO_TABLE="info_cache" \
CANTALOUPE_JDBCCACHE_PASSWORD="password" \
CANTALOUPE_JDBCCACHE_URL="jdbc:postgresql:__database:5432_cantaloupe" \
CANTALOUPE_JDBCCACHE_URL="jdbc:postgresql://database:5432/cantaloupe" \
CANTALOUPE_JDBCCACHE_USER="admin" \
CANTALOUPE_JDBCSOURE_CONNECTION_TIMEOUT="10" \
CANTALOUPE_JDBCSOURE_PASSWORD="password" \
CANTALOUPE_JDBCSOURE_URL="jdbc:postgresql:__database:5432_cantaloupe" \
CANTALOUPE_JDBCSOURE_URL="jdbc:postgresql://database:5432/cantaloupe" \
CANTALOUPE_JDBCSOURE_USER="admin" \
CANTALOUPE_LOG_ACCESS_CONSOLEAPPENDER_ENABLED="false" \
CANTALOUPE_LOG_ACCESS_CONSOLEAPPENDER_ENABLED="true" \
CANTALOUPE_LOG_ACCESS_FILEAPPENDER_ENABLED="false" \
CANTALOUPE_LOG_ACCESS_FILEAPPENDER_PATHNAME="_opt_tomcat_logs_cantaloupe.access.log" \
CANTALOUPE_LOG_ACCESS_ROLLINGFILEAPPENDER_ENABLED="true" \
CANTALOUPE_LOG_ACCESS_ROLLINGFILEAPPENDER_PATHNAME="_opt_tomcat_logs_cantaloupe.access.log" \
CANTALOUPE_LOG_ACCESS_FILEAPPENDER_PATHNAME="/opt/tomcat/logs/cantaloupe.access.log" \
CANTALOUPE_LOG_ACCESS_ROLLINGFILEAPPENDER_ENABLED="false" \
CANTALOUPE_LOG_ACCESS_ROLLINGFILEAPPENDER_PATHNAME="/opt/tomcat/logs/cantaloupe.access.log" \
CANTALOUPE_LOG_ACCESS_ROLLINGFILEAPPENDER_POLICY="TimeBasedRollingPolicy" \
CANTALOUPE_LOG_ACCESS_ROLLINGFILEAPPENDER_TIMEBASEDROLLINGPOLICY_FILENAME_PATTERN="_opt_tomcat_logs_cantaloupe.access-%d{yyyy-MM-dd}.log" \
CANTALOUPE_LOG_ACCESS_ROLLINGFILEAPPENDER_TIMEBASEDROLLINGPOLICY_FILENAME_PATTERN="/opt/tomcat/logs/cantaloupe.access-%d{yyyy-MM-dd}.log" \
CANTALOUPE_LOG_ACCESS_ROLLINGFILEAPPENDER_TIMEBASEDROLLINGPOLICY_MAX_HISTORY="30" \
CANTALOUPE_LOG_ACCESS_SYSLOGAPPENDER_ENABLED="false" \
CANTALOUPE_LOG_ACCESS_SYSLOGAPPENDER_FACILITY="LOCAL0" \
CANTALOUPE_LOG_ACCESS_SYSLOGAPPENDER_HOST= \
CANTALOUPE_LOG_ACCESS_SYSLOGAPPENDER_PORT="514" \
CANTALOUPE_LOG_APPLICATION_CONSOLEAPPENDER_ENABLED="false" \
CANTALOUPE_LOG_APPLICATION_CONSOLEAPPENDER_ENABLED="true" \
CANTALOUPE_LOG_APPLICATION_CONSOLEAPPENDER_LOGSTASH_ENABLED="false" \
CANTALOUPE_LOG_APPLICATION_FILEAPPENDER_ENABLED="false" \
CANTALOUPE_LOG_APPLICATION_FILEAPPENDER_LOGSTASH_ENABLED="false" \
CANTALOUPE_LOG_APPLICATION_FILEAPPENDER_PATHNAME="_opt_tomcat_logs_cantaloupe.application.log" \
CANTALOUPE_LOG_APPLICATION_FILEAPPENDER_PATHNAME="/opt/tomcat/logs/cantaloupe.application.log" \
CANTALOUPE_LOG_APPLICATION_LEVEL="debug" \
CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_ENABLED="true" \
CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_ENABLED="false" \
CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_LOGSTASH_ENABLED="false" \
CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_PATHNAME="_opt_tomcat_logs_cantaloupe.application.log" \
CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_PATHNAME="/opt/tomcat/logs/cantaloupe.application.log" \
CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_POLICY="TimeBasedRollingPolicy" \
CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_TIMEBASEDROLLINGPOLICY_FILENAME_PATTERN="_opt_tomcat_logs_cantaloupe.application-%d{yyyy-MM-dd}.log" \
CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_TIMEBASEDROLLINGPOLICY_FILENAME_PATTERN="/opt/tomcat/logs/cantaloupe.application-%d{yyyy-MM-dd}.log" \
CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_TIMEBASEDROLLINGPOLICY_MAX_HISTORY="30" \
CANTALOUPE_LOG_APPLICATION_SYSLOGAPPENDER_ENABLED="false" \
CANTALOUPE_LOG_APPLICATION_SYSLOGAPPENDER_FACILITY="LOCAL0" \
CANTALOUPE_LOG_APPLICATION_SYSLOGAPPENDER_HOST= \
CANTALOUPE_LOG_APPLICATION_SYSLOGAPPENDER_PORT="514" \
CANTALOUPE_LOG_ERROR_FILEAPPENDER_ENABLED="false" \
CANTALOUPE_LOG_ERROR_FILEAPPENDER_LOGSTASH_ENABLED="false" \
CANTALOUPE_LOG_ERROR_FILEAPPENDER_PATHNAME="_opt_tomcat_logs_cantaloupe.error.log" \
CANTALOUPE_LOG_ERROR_ROLLINGFILEAPPENDER_ENABLED="true" \
CANTALOUPE_LOG_ERROR_FILEAPPENDER_PATHNAME="/opt/tomcat/logs/cantaloupe.error.log" \
CANTALOUPE_LOG_ERROR_ROLLINGFILEAPPENDER_ENABLED="false" \
CANTALOUPE_LOG_ERROR_ROLLINGFILEAPPENDER_LOGSTASH_ENABLED="false" \
CANTALOUPE_LOG_ERROR_ROLLINGFILEAPPENDER_PATHNAME="_opt_tomcat_logs_cantaloupe.error.log" \
CANTALOUPE_LOG_ERROR_ROLLINGFILEAPPENDER_PATHNAME="/opt/tomcat/logs/cantaloupe.error.log" \
CANTALOUPE_LOG_ERROR_ROLLINGFILEAPPENDER_POLICY="TimeBasedRollingPolicy" \
CANTALOUPE_LOG_ERROR_ROLLINGFILEAPPENDER_TIMEBASEDROLLINGPOLICY_FILENAME_PATTERN="_opt_tomcat_logs_cantaloupe.error-%d{yyyy-MM-dd}.log" \
CANTALOUPE_LOG_ERROR_ROLLINGFILEAPPENDER_TIMEBASEDROLLINGPOLICY_FILENAME_PATTERN="/opt/tomcat/logs/cantaloupe.error-%d{yyyy-MM-dd}.log" \
CANTALOUPE_LOG_ERROR_ROLLINGFILEAPPENDER_TIMEBASEDROLLINGPOLICY_MAX_HISTORY="30" \
CANTALOUPE_MAX_PIXELS="400000000" \
CANTALOUPE_METADATA_PRESERVE="false" \
CANTALOUPE_METADATA_RESPECT_ORIENTATION="false" \
CANTALOUPE_OPENJPEGPROCESSOR_PATH_TO_BINARIES= \
CANTALOUPE_OVERLAYS_BASICSTRATEGY_IMAGE="_path_to_overlay.png" \
CANTALOUPE_OVERLAYS_BASICSTRATEGY_IMAGE="/path/to/overlay.png" \
CANTALOUPE_OVERLAYS_BASICSTRATEGY_INSET="10" \
CANTALOUPE_OVERLAYS_BASICSTRATEGY_OUTPUT_HEIGHT_THRESHOLD="300" \
CANTALOUPE_OVERLAYS_BASICSTRATEGY_OUTPUT_WIDTH_THRESHOLD="400" \
Expand Down
11 changes: 5 additions & 6 deletions cantaloupe/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ additional settings, volumes, ports, etc.
| CANTALOUPE_METADATA_PRESERVE | /cantaloupe/metadata/preserve | false |
| CANTALOUPE_METADATA_RESPECT_ORIENTATION | /cantaloupe/metadata/respect/orientation | false |
| CANTALOUPE_LOG_APPLICATION_LEVEL | /cantaloupe/log/application/level | debug |
| CANTALOUPE_LOG_APPLICATION_CONSOLEAPPENDER_ENABLED | /cantaloupe/log/application/consoleappender/enabled | false |
| CANTALOUPE_LOG_APPLICATION_CONSOLEAPPENDER_ENABLED | /cantaloupe/log/application/consoleappender/enabled | true |
| CANTALOUPE_LOG_APPLICATION_FILEAPPENDER_ENABLED | /cantaloupe/log/application/fileappender/enabled | false |
| CANTALOUPE_LOG_APPLICATION_FILEAPPENDER_PATHNAME | /cantaloupe/log/application/fileappender/pathname | /opt/tomcat/logs/cantaloupe.application.log |
| CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_ENABLED | /cantaloupe/log/application/rollingfileappender/enabled | true |
| CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_ENABLED | /cantaloupe/log/application/rollingfileappender/enabled | false |
| CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_PATHNAME | /cantaloupe/log/application/rollingfileappender/pathname | /opt/tomcat/logs/cantaloupe.application.log |
| CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_POLICY | /cantaloupe/log/application/rollingfileappender/policy | TimeBasedRollingPolicy |
| CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_TIMEBASEDROLLINGPOLICY_FILENAME_PATTERN | /cantaloupe/log/application/rollingfileappender/timebasedrollingpolicy/filename/pattern | /opt/tomcat/logs/cantaloupe.application-%d{yyyy-MM-dd}.log |
Expand All @@ -179,10 +179,9 @@ additional settings, volumes, ports, etc.
| CANTALOUPE_LOG_APPLICATION_SYSLOGAPPENDER_HOST | /cantaloupe/log/application/syslogappender/host | |
| CANTALOUPE_LOG_APPLICATION_SYSLOGAPPENDER_PORT | /cantaloupe/log/application/syslogappender/port | 514 |
| CANTALOUPE_LOG_APPLICATION_SYSLOGAPPENDER_FACILITY | /cantaloupe/log/application/syslogappender/facility | LOCAL0 |
| CANTALOUPE_LOG_ERROR_CONSOLEAPPENDER_ENABLED | /cantaloupe/log/error/consoleappender/enabled | false |
| CANTALOUPE_LOG_ERROR_FILEAPPENDER_ENABLED | /cantaloupe/log/error/fileappender/enabled | false |
| CANTALOUPE_LOG_ERROR_FILEAPPENDER_PATHNAME | /cantaloupe/log/error/fileappender/pathname | /opt/tomcat/logs/cantaloupe.error.log |
| CANTALOUPE_LOG_ERROR_ROLLINGFILEAPPENDER_ENABLED | /cantaloupe/log/error/rollingfileappender/enabled | true |
| CANTALOUPE_LOG_ERROR_ROLLINGFILEAPPENDER_ENABLED | /cantaloupe/log/error/rollingfileappender/enabled | false |
| CANTALOUPE_LOG_ERROR_ROLLINGFILEAPPENDER_PATHNAME | /cantaloupe/log/error/rollingfileappender/pathname | /opt/tomcat/logs/cantaloupe.error.log |
| CANTALOUPE_LOG_ERROR_ROLLINGFILEAPPENDER_POLICY | /cantaloupe/log/error/rollingfileappender/policy | TimeBasedRollingPolicy |
| CANTALOUPE_LOG_ERROR_ROLLINGFILEAPPENDER_TIMEBASEDROLLINGPOLICY_FILENAME_PATTERN | /cantaloupe/log/error/rollingfileappender/timebasedrollingpolicy/filename/pattern | /opt/tomcat/logs/cantaloupe.error-%d{yyyy-MM-dd}.log |
Expand All @@ -191,10 +190,10 @@ additional settings, volumes, ports, etc.
| CANTALOUPE_LOG_ERROR_SYSLOGAPPENDER_HOST | /cantaloupe/log/error/syslogappender/host | |
| CANTALOUPE_LOG_ERROR_SYSLOGAPPENDER_PORT | /cantaloupe/log/error/syslogappender/port | 514 |
| CANTALOUPE_LOG_ERROR_SYSLOGAPPENDER_FACILITY | /cantaloupe/log/error/syslogappender/facility | LOCAL0 |
| CANTALOUPE_LOG_ACCESS_CONSOLEAPPENDER_ENABLED | /cantaloupe/log/access/consoleappender/enabled | false |
| CANTALOUPE_LOG_ACCESS_CONSOLEAPPENDER_ENABLED | /cantaloupe/log/access/consoleappender/enabled | true |
| CANTALOUPE_LOG_ACCESS_FILEAPPENDER_ENABLED | /cantaloupe/log/access/fileappender/enabled | false |
| CANTALOUPE_LOG_ACCESS_FILEAPPENDER_PATHNAME | /cantaloupe/log/access/fileappender/pathname | /opt/tomcat/logs/cantaloupe.access.log |
| CANTALOUPE_LOG_ACCESS_ROLLINGFILEAPPENDER_ENABLED | /cantaloupe/log/access/rollingfileappender/enabled | true |
| CANTALOUPE_LOG_ACCESS_ROLLINGFILEAPPENDER_ENABLED | /cantaloupe/log/access/rollingfileappender/enabled | false |
| CANTALOUPE_LOG_ACCESS_ROLLINGFILEAPPENDER_PATHNAME | /cantaloupe/log/access/rollingfileappender/pathname | /opt/tomcat/logs/cantaloupe.access.log |
| CANTALOUPE_LOG_ACCESS_ROLLINGFILEAPPENDER_POLICY | /cantaloupe/log/access/rollingfileappender/policy | TimeBasedRollingPolicy |
| CANTALOUPE_LOG_ACCESS_ROLLINGFILEAPPENDER_TIMEBASEDROLLINGPOLICY_FILENAME_PATTERN | /cantaloupe/log/access/rollingfileappender/timebasedrollingpolicy/filename/pattern | /opt/tomcat/logs/cantaloupe.access-%d{yyyy-MM-dd}.log |
Expand Down
9 changes: 0 additions & 9 deletions cantaloupe/rootfs/etc/cont-init.d/02-cantoloupe-install.sh
View file

This file was deleted.

0 comments on commit 1345d80

Please sign in to comment.