Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[minor] Update all non-major dependencies #372

Merged
merged 4 commits into from
Feb 27, 2025
Merged

[minor] Update all non-major dependencies #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
565bbfd
Update all non-major dependencies
isle-buildkit-renovate[bot] Feb 26, 2025
734ef21
solr.config.lib.enabled=true
joecorall Feb 26, 2025
8bf3152
fixup solr flag from -j to --jvm-opts
joecorall Feb 26, 2025
ee1da5e
update readme
joecorall Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions handle/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions solr/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
14 changes: 7 additions & 7 deletions solr/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion solr/rootfs/etc/s6-overlay/s6-rc.d/solr/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure when solr changed this; must have been in 9.8 bump. Using -j solr would fail to start with

 ERROR: Jetty config is required when using the -j option!
 Usage: solr start [-f] [-c] [--host host] [-p port] [--server-dir directory] [-z zkHost] [-m memory] [-e example] [--solr-home solr.solr.home] [--data-home solr.data.home] [--jvm-opts "jvm-opts"] [-V]

fi

if [[ -n "${SOLR_JAVA_OPTS}" ]]; then
Expand Down
4 changes: 2 additions & 2 deletions test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions tomcat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tomcat/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
Loading