diff --git a/bitnami/solr/9/debian-12/Dockerfile b/bitnami/solr/9/debian-12/Dockerfile index 9f00ae96fa7f..228d230fae3d 100644 --- a/bitnami/solr/9/debian-12/Dockerfile +++ b/bitnami/solr/9/debian-12/Dockerfile @@ -9,11 +9,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-03-12T01:11:23Z" \ + org.opencontainers.image.created="2025-03-17T11:05:55Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/solr/README.md" \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="9.8.1-debian-12-r0" \ + org.opencontainers.image.ref.name="9.8.1-debian-12-r1" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/solr" \ org.opencontainers.image.title="solr" \ org.opencontainers.image.vendor="Broadcom, Inc." \ diff --git a/bitnami/solr/9/debian-12/rootfs/opt/bitnami/scripts/libsolr.sh b/bitnami/solr/9/debian-12/rootfs/opt/bitnami/scripts/libsolr.sh index 776dc738b14b..d43e25907c91 100644 --- a/bitnami/solr/9/debian-12/rootfs/opt/bitnami/scripts/libsolr.sh +++ b/bitnami/solr/9/debian-12/rootfs/opt/bitnami/scripts/libsolr.sh @@ -162,7 +162,7 @@ solr_wait_for_zookeeper() { host="${BASH_REMATCH[1]}" port="${BASH_REMATCH[2]}" debug "Trying: $host:$port" - if ! retry_while "debug_execute nc -w $SOLR_ZK_CONNECTION_ATTEMPT_TIMEOUT -z ${host} ${port}" "$SOLR_ZK_MAX_RETRIES" "$SOLR_ZK_SLEEP_TIME"; then + if ! retry_while "debug_execute nc -w ${SOLR_ZK_CONNECTION_TIMEOUT} -z ${host} ${port}" "$SOLR_ZK_MAX_RETRIES" "$SOLR_ZK_SLEEP_TIME"; then error "Failed to connect to the zookeeper node at ${host}:${port}" return 1 fi diff --git a/bitnami/solr/9/debian-12/rootfs/opt/bitnami/scripts/solr-env.sh b/bitnami/solr/9/debian-12/rootfs/opt/bitnami/scripts/solr-env.sh index a41e93f1e8d1..3442e7fd06d9 100644 --- a/bitnami/solr/9/debian-12/rootfs/opt/bitnami/scripts/solr-env.sh +++ b/bitnami/solr/9/debian-12/rootfs/opt/bitnami/scripts/solr-env.sh @@ -48,7 +48,6 @@ solr_env_vars=( SOLR_ZK_CHROOT SOLR_ZK_HOSTS SOLR_COLLECTION - SOLR_ZK_CONNECTION_ATTEMPT_TIMEOUT ) for env_var in "${solr_env_vars[@]}"; do file_env_var="${env_var}_FILE" @@ -110,6 +109,6 @@ export SOLR_ZK_MAX_RETRIES="${SOLR_ZK_MAX_RETRIES:-5}" export SOLR_ZK_SLEEP_TIME="${SOLR_ZK_SLEEP_TIME:-5}" export SOLR_ZK_CHROOT="${SOLR_ZK_CHROOT:-/solr}" export SOLR_ZK_HOSTS="${SOLR_ZK_HOSTS:-}" -export SOLR_ZK_CONNECTION_ATTEMPT_TIMEOUT="${SOLR_ZK_CONNECTION_ATTEMPT_TIMEOUT:-10}" +export SOLR_ZK_CONNECTION_TIMEOUT="10" # Custom environment variables may be defined below diff --git a/bitnami/solr/README.md b/bitnami/solr/README.md index f0fc63dc0a6d..c06839017bf1 100644 --- a/bitnami/solr/README.md +++ b/bitnami/solr/README.md @@ -150,50 +150,50 @@ docker-compose up -d #### Customizable environment variables -| Name | Description | Default Value | -|--------------------------------------|-------------------------------------------------------------------------------|----------------------------------------------------| -| `SOLR_ENABLE_CLOUD_MODE` | Starts solr in cloud mode | `no` | -| `SOLR_NUMBER_OF_NODES` | Number of nodes of the solr cloud cluster | `1` | -| `SOLR_HOST` | Solr Host name | `nil` | -| `SOLR_JETTY_HOST` | Configuration to listen on a specific IP address or host name | `0.0.0.0` | -| `SOLR_HEAP` | Solr Heap | `nil` | -| `SOLR_SECURITY_MANAGER_ENABLED` | Solr Java security manager | `false` | -| `SOLR_JAVA_MEM` | Solr JVM memory | `-Xms512m -Xmx512m` | -| `SOLR_PORT_NUMBER` | Solr port number | `8983` | -| `SOLR_CORES` | Solr CORE name | `nil` | -| `SOLR_COLLECTION` | Solr COLLECTION name | `nil` | -| `SOLR_COLLECTION_REPLICAS` | Solar collection replicas | `1` | -| `SOLR_COLLECTION_SHARDS` | Solar collection shards | `1` | -| `SOLR_ENABLE_AUTHENTICATION` | Enables authentication | `no` | -| `SOLR_ADMIN_USERNAME` | Administrator Username | `admin` | -| `SOLR_ADMIN_PASSWORD` | Administrator password | `bitnami` | -| `SOLR_CLOUD_BOOTSTRAP` | Indicates if this node is the one that performs the boostraping | `no` | -| `SOLR_CORE_CONF_DIR` | Solar CORE configuration directory | `${SOLR_SERVER_DIR}/solr/configsets/_default/conf` | -| `SOLR_SSL_ENABLED` | Indicates if Solr starts with SSL enabled | `no` | -| `SOLR_SSL_CHECK_PEER_NAME` | Indicates if Solr should check the peer names | `false` | -| `SOLR_ZK_MAX_RETRIES` | Maximum retries when waiting for zookeeper configuration operations to finish | `5` | -| `SOLR_ZK_SLEEP_TIME` | Sleep time when waiting for zookeeper configuration operations to finish | `5` | -| `SOLR_ZK_CHROOT` | ZooKeeper ZNode chroot where to store solr data. Default: /solr | `/solr` | -| `SOLR_ZK_HOSTS` | ZooKeeper nodes (comma-separated list of `host:port`\) | `nil` | -| `SOLR_ZK_CONNECTION_ATTEMPT_TIMEOUT` | ZooKeeper connection attempt timeout in seconds | `10` | +| Name | Description | Default Value | +|---------------------------------|-------------------------------------------------------------------------------|----------------------------------------------------| +| `SOLR_ENABLE_CLOUD_MODE` | Starts solr in cloud mode | `no` | +| `SOLR_NUMBER_OF_NODES` | Number of nodes of the solr cloud cluster | `1` | +| `SOLR_HOST` | Solr Host name | `nil` | +| `SOLR_JETTY_HOST` | Configuration to listen on a specific IP address or host name | `0.0.0.0` | +| `SOLR_HEAP` | Solr Heap | `nil` | +| `SOLR_SECURITY_MANAGER_ENABLED` | Solr Java security manager | `false` | +| `SOLR_JAVA_MEM` | Solr JVM memory | `-Xms512m -Xmx512m` | +| `SOLR_PORT_NUMBER` | Solr port number | `8983` | +| `SOLR_CORES` | Solr CORE name | `nil` | +| `SOLR_COLLECTION` | Solr COLLECTION name | `nil` | +| `SOLR_COLLECTION_REPLICAS` | Solar collection replicas | `1` | +| `SOLR_COLLECTION_SHARDS` | Solar collection shards | `1` | +| `SOLR_ENABLE_AUTHENTICATION` | Enables authentication | `no` | +| `SOLR_ADMIN_USERNAME` | Administrator Username | `admin` | +| `SOLR_ADMIN_PASSWORD` | Administrator password | `bitnami` | +| `SOLR_CLOUD_BOOTSTRAP` | Indicates if this node is the one that performs the boostraping | `no` | +| `SOLR_CORE_CONF_DIR` | Solar CORE configuration directory | `${SOLR_SERVER_DIR}/solr/configsets/_default/conf` | +| `SOLR_SSL_ENABLED` | Indicates if Solr starts with SSL enabled | `no` | +| `SOLR_SSL_CHECK_PEER_NAME` | Indicates if Solr should check the peer names | `false` | +| `SOLR_ZK_MAX_RETRIES` | Maximum retries when waiting for zookeeper configuration operations to finish | `5` | +| `SOLR_ZK_SLEEP_TIME` | Sleep time when waiting for zookeeper configuration operations to finish | `5` | +| `SOLR_ZK_CHROOT` | ZooKeeper ZNode chroot where to store solr data. Default: /solr | `/solr` | +| `SOLR_ZK_HOSTS` | ZooKeeper nodes (comma-separated list of `host:port`\) | `nil` | #### Read-only environment variables -| Name | Description | Value | -|------------------------|----------------------------------------|------------------------------------------------| -| `BITNAMI_VOLUME_DIR` | Directory where to mount volumes. | `/bitnami` | -| `SOLR_BASE_DIR` | Solr installation directory. | `${BITNAMI_ROOT_DIR}/solr` | -| `SOLR_JAVA_HOME` | JAVA installation directory. | `${BITNAMI_ROOT_DIR}/java` | -| `SOLR_BIN_DIR` | Solr directory for binary executables. | `${SOLR_BASE_DIR}/bin` | -| `SOLR_TMP_DIR` | Solr directory for temp files. | `${SOLR_BASE_DIR}/tmp` | -| `SOLR_PID_DIR` | Solr directory for PID files. | `${SOLR_BASE_DIR}/tmp` | -| `SOLR_LOGS_DIR` | Solr directory for logs files. | `${SOLR_BASE_DIR}/logs` | -| `SOLR_SERVER_DIR` | Solr directory for server files. | `${SOLR_BASE_DIR}/server` | -| `SOLR_VOLUME_DIR` | Solr persistence directory. | `${BITNAMI_VOLUME_DIR}/solr` | -| `SOLR_DATA_TO_PERSIST` | Solr data to persist. | `server/solr` | -| `SOLR_PID_FILE` | Solr PID file | `${SOLR_PID_DIR}/solr-${SOLR_PORT_NUMBER}.pid` | -| `SOLR_DAEMON_USER` | Solr system user | `solr` | -| `SOLR_DAEMON_GROUP` | Solr system group | `solr` | +| Name | Description | Value | +|------------------------------|----------------------------------------|------------------------------------------------| +| `BITNAMI_VOLUME_DIR` | Directory where to mount volumes. | `/bitnami` | +| `SOLR_BASE_DIR` | Solr installation directory. | `${BITNAMI_ROOT_DIR}/solr` | +| `SOLR_JAVA_HOME` | JAVA installation directory. | `${BITNAMI_ROOT_DIR}/java` | +| `SOLR_BIN_DIR` | Solr directory for binary executables. | `${SOLR_BASE_DIR}/bin` | +| `SOLR_TMP_DIR` | Solr directory for temp files. | `${SOLR_BASE_DIR}/tmp` | +| `SOLR_PID_DIR` | Solr directory for PID files. | `${SOLR_BASE_DIR}/tmp` | +| `SOLR_LOGS_DIR` | Solr directory for logs files. | `${SOLR_BASE_DIR}/logs` | +| `SOLR_SERVER_DIR` | Solr directory for server files. | `${SOLR_BASE_DIR}/server` | +| `SOLR_VOLUME_DIR` | Solr persistence directory. | `${BITNAMI_VOLUME_DIR}/solr` | +| `SOLR_DATA_TO_PERSIST` | Solr data to persist. | `server/solr` | +| `SOLR_PID_FILE` | Solr PID file | `${SOLR_PID_DIR}/solr-${SOLR_PORT_NUMBER}.pid` | +| `SOLR_DAEMON_USER` | Solr system user | `solr` | +| `SOLR_DAEMON_GROUP` | Solr system group | `solr` | +| `SOLR_ZK_CONNECTION_TIMEOUT` | ZooKeeper connection attempt timeout. | `10` | When you start the solr image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the `docker run` command line.