diff --git a/handle/Dockerfile b/handle/Dockerfile index e7e19226..a9a3cca4 100644 --- a/handle/Dockerfile +++ b/handle/Dockerfile @@ -8,10 +8,10 @@ ARG HANDLE_URL="https://handle.net/hnr-source/${HANDLE_FILE}" ARG HANDLE_FILE_SHA256="03c659511acb0f11a89d7f8993f47b156c3b93b288ef64a3170e09a32c526417" # renovate: datasource=github-tags depName=jdbc-mysql packageName=mysql/mysql-connector-j -ARG MYSQL_DRIVER_VERSION=9.1.0 +ARG MYSQL_DRIVER_VERSION=9.2.0 ARG MYSQL_DRIVER_FILE="mysql-connector-j-${MYSQL_DRIVER_VERSION}.tar.gz" ARG MYSQL_DRIVER_URL="https://dev.mysql.com/get/Downloads/Connector-J/${MYSQL_DRIVER_FILE}" -ARG MYSQL_DRIVER_FILE_SHA256="f5198db93f529206d7f13f613c38753fec0b698be9f5410391aed1d62c57acb7" +ARG MYSQL_DRIVER_FILE_SHA256="f50ca00f8d85d39abd521fd45167242a750015203f79d40759bb3ea9e783dcbd" # renovate: datasource=github-releases depName=jdbc-postgres packageName=pgjdbc/pgjdbc ARG POSTGRES_DRIVER_VERSION=42.7.5 diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 93cec8eb..1781e143 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -3,10 +3,10 @@ FROM base ARG TARGETARCH # renovate: datasource=github-releases depName=custom-composer packageName=composer/composer -ARG COMPOSER_VERSION=2.8.4 +ARG COMPOSER_VERSION=2.8.6 ARG COMPOSER_FILE=composer.phar ARG COMPOSER_URL=https://getcomposer.org/download/${COMPOSER_VERSION}/${COMPOSER_FILE} -ARG COMPOSER_SHA256="c4c4e2e1beab0ea04e0bd042a5dbba9feda1fbf5eda0d36203958edd343c0a8a" +ARG COMPOSER_SHA256="becc28b909d2cca563e7caee1e488063312af36b1f2e31db64f417723b8c4026" WORKDIR /var/www diff --git a/solr/Dockerfile b/solr/Dockerfile index e5df810f..b4e0fe5f 100644 --- a/solr/Dockerfile +++ b/solr/Dockerfile @@ -3,15 +3,15 @@ FROM java ARG TARGETARCH # renovate: datasource=github-tags depName=apache-solr packageName=apache/solr -ARG SOLR_VERSION=9.7.0 +ARG SOLR_VERSION=9.8.0 ARG SOLR_FILE=solr-${SOLR_VERSION}.tgz ARG SOLR_URL=https://archive.apache.org/dist/solr/solr/${SOLR_VERSION}/solr-${SOLR_VERSION}.tgz -ARG SOLR_FILE_SHA256="38548b86fa4e3c87883875952da124bf7d742cb8f7b25d37a1176833588e8552" +ARG SOLR_FILE_SHA256="9948dcf798c196b834c4cbb420d1ea5995479431669d266c33d46548b67e69e1" # renovate: datasource=github-releases depName=solr-ocrhighlighting packageName=dbmdz/solr-ocrhighlighting -ARG OCRHIGHLIGHT_VERSION=0.9.1 +ARG OCRHIGHLIGHT_VERSION=0.9.2 ARG OCRHIGHLIGHT_FILE=solr-ocrhighlighting-${OCRHIGHLIGHT_VERSION}.jar ARG OCRHIGHLIGHT_URL=https://github.com/dbmdz/solr-ocrhighlighting/releases/download/${OCRHIGHLIGHT_VERSION}/solr-ocrhighlighting-${OCRHIGHLIGHT_VERSION}.jar -ARG OCRHIGHLIGHT_FILE_SHA256="91be01fe52553ea774b9a6804b149ab2fc9b8937eb19d91455b0b17c865c2971" +ARG OCRHIGHLIGHT_FILE_SHA256="e47ccc180fb0eecb9b68fa8506bbe0b22d416758a5277bce58073e898f9e07fb" ARG OCRHIGHLIGHT_DEST=/opt/solr/server/solr/contrib/ocrhighlighting/lib EXPOSE 8983 @@ -45,7 +45,7 @@ RUN create-service-user.sh --name solr /data && \ # Defaults environment variables to be overloaded. ENV \ SOLR_JAVA_OPTS= \ - SOLR_JETTY_OPTS=-Dsolr.jetty.host=0.0.0.0 \ + SOLR_JETTY_OPTS="-Dsolr.jetty.host=0.0.0.0 -Dsolr.config.lib.enabled=true" \ SOLR_LOG_LEVEL=INFO \ SOLR_MEMORY=512m diff --git a/solr/README.md b/solr/README.md index 2d00e886..e6c47cf8 100644 --- a/solr/README.md +++ b/solr/README.md @@ -1,6 +1,6 @@ # Solr -Docker image for [solr] version 9.7.0. +Docker image for [solr] version 9.8.0. Built from [Islandora-DevOps/isle-buildkit solr](https://github.com/Islandora-DevOps/isle-buildkit/tree/main/solr) @@ -21,12 +21,12 @@ additional settings, volumes, ports, etc. ## Settings -| Environment Variable | Default | Description | -| :------------------- | :-------------------------- | :----------------------------------------------------------------------------- | -| SOLR_JAVA_OPTS | | Additional parameters to pass to the JVM when starting Solr | -| SOLR_JETTY_OPTS | `-Dsolr.jetty.host=0.0.0.0` | Additional parameters to pass to Jetty when starting Solr. | -| SOLR_LOG_LEVEL | `INFO` | Log level. Possible Values: OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE or ALL | -| SOLR_MEMORY | `512m` | Sets the min (-Xms) and max (-Xmx) heap size for the JVM | +| Environment Variable | Default | Description | +| :------------------- | :--------------------------------------------------------- | :----------------------------------------------------------------------------- | +| SOLR_JAVA_OPTS | | Additional parameters to pass to the JVM when starting Solr | +| SOLR_JETTY_OPTS | `-Dsolr.jetty.host=0.0.0.0 -Dsolr.config.lib.enabled=true` | Additional parameters to pass to Jetty when starting Solr. | +| SOLR_LOG_LEVEL | `INFO` | Log level. Possible Values: OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE or ALL | +| SOLR_MEMORY | `512m` | Sets the min (-Xms) and max (-Xmx) heap size for the JVM | ## Ports diff --git a/solr/rootfs/etc/s6-overlay/s6-rc.d/solr/run b/solr/rootfs/etc/s6-overlay/s6-rc.d/solr/run index 593a6534..e7f87058 100755 --- a/solr/rootfs/etc/s6-overlay/s6-rc.d/solr/run +++ b/solr/rootfs/etc/s6-overlay/s6-rc.d/solr/run @@ -4,7 +4,7 @@ set -e ARGS=(-m "${SOLR_MEMORY}") if [[ -n "${SOLR_JETTY_OPTS}" ]]; then - ARGS+=(-j "${SOLR_JETTY_OPTS}") + ARGS+=(--jvm-opts "${SOLR_JETTY_OPTS}") fi if [[ -n "${SOLR_JAVA_OPTS}" ]]; then diff --git a/test/Dockerfile b/test/Dockerfile index ed0a5564..36625a1a 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -3,10 +3,10 @@ FROM drupal ARG TARGETARCH # renovate: datasource=git-refs depName=islandora-starter-site packageName=https://github.com/islandora-devops/islandora-starter-site branch=main -ARG COMMIT=082032e325509950b3df535fd1630b5492af4f36 +ARG COMMIT=b723fb8d701576e2f7b539b6e75ea5ce09bbc53e ARG FILE=${COMMIT}.tar.gz ARG URL=https://github.com/Islandora/islandora-starter-site/archive/${FILE} -ARG SHA256="0f72c3e9d721e4bac328b5cf11b06e046f45fafea1382d57abacf2d597fbf0d5" +ARG SHA256="cca30dcdc8474536d82b2faca590bd64a4572ca03a935453ccfbdd77a592e2f3" # Platform agnostic does not require arch specific identifier. RUN --mount=type=cache,id=test-downloads-${TARGETARCH},sharing=locked,target=/opt/downloads \ diff --git a/tomcat/Dockerfile b/tomcat/Dockerfile index aa863857..b1ecfa61 100644 --- a/tomcat/Dockerfile +++ b/tomcat/Dockerfile @@ -3,8 +3,8 @@ FROM java ARG TARGETARCH # renovate: datasource=github-tags depName=apache-tomcat packageName=apache/tomcat -ARG TOMCAT_VERSION=9.0.98 -ARG TOMCAT_FILE_SHA256="1d9a1104c2e235a5baff6e9ca8e28be3d864803fafc478f5c13c2ae6a5ed3d6f" +ARG TOMCAT_VERSION=9.0.100 +ARG TOMCAT_FILE_SHA256="1253158c45a31a8168b41436512acc2292e94a3468b1bd8e4d0a7a79dcc1f5ff" EXPOSE 8080 diff --git a/tomcat/README.md b/tomcat/README.md index 52304378..a0f55f12 100644 --- a/tomcat/README.md +++ b/tomcat/README.md @@ -1,6 +1,6 @@ # Tomcat -Docker image for [Tomcat] version 9.0.98. +Docker image for [Tomcat] version 9.0.100. Built from [Islandora-DevOps/isle-buildkit tomcat](https://github.com/Islandora-DevOps/isle-buildkit/tree/main/tomcat)