diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml index 5d7f271d..a8efecaa 100644 --- a/.github/workflows/build-latest.yaml +++ b/.github/workflows/build-latest.yaml @@ -33,15 +33,7 @@ jobs: javaHome: /opt/java/openjdk geoserverMinorVersion: - minor: 22 - patch: 0 - - minor: 22 - patch: 1 - - minor: 22 - patch: 2 - - minor: 22 - patch: 3 - - minor: 23 - patch: 0 + patch: 4 - minor: 23 patch: 1 downloadAllStableExtensions: @@ -105,11 +97,9 @@ jobs: javaHome: /opt/java/openjdk geoserverMinorVersion: - minor: 22 - patch: 0 - - minor: 22 - patch: 1 + patch: 4 - minor: 23 - patch: 0 + patch: 1 downloadAllStableExtensions: - 1 downloadAllCommunityExtensions: diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml index a52720b2..6e658658 100644 --- a/.github/workflows/deploy-image.yaml +++ b/.github/workflows/deploy-image.yaml @@ -35,15 +35,7 @@ jobs: javaHome: /opt/java/openjdk geoserverMinorVersion: - minor: 22 - patch: 0 - - minor: 22 - patch: 1 - - minor: 22 - patch: 2 - - minor: 22 - patch: 3 - - minor: 23 - patch: 0 + patch: 4 - minor: 23 patch: 1 downloadAllStableExtensions: diff --git a/build_data/community_plugins.txt b/build_data/community_plugins.txt index 15e66d93..d3e30b2b 100644 --- a/build_data/community_plugins.txt +++ b/build_data/community_plugins.txt @@ -36,6 +36,7 @@ ogr-datastore-plugin opensearch-eo-plugin ows-simulate-plugin pgraster-plugin +s3-geotiff-plugin saml-plugin sec-keycloak-plugin sec-oauth2-geonode-plugin @@ -44,11 +45,14 @@ sec-oauth2-google-plugin sec-oauth2-openid-connect-plugin smart-data-loader-plugin solr-plugin +spatialjson-plugin +stac-datastore-plugin taskmanager-core-plugin taskmanager-s3-plugin teradata-plugin +vector-mosaic-plugin vsi-plugin +webp-plugin wms-eo-plugin wmts-styles-plugin wps-remote-plugin -stac-datastore-plugin diff --git a/build_data/stable_plugins.txt b/build_data/stable_plugins.txt index 75a185ce..d7468cab 100644 --- a/build_data/stable_plugins.txt +++ b/build_data/stable_plugins.txt @@ -2,25 +2,32 @@ app-schema-plugin authkey-plugin cas-plugin charts-plugin +control-flow-plugin css-plugin csw-iso-plugin +csw-plugin db2-plugin dxf-plugin excel-plugin feature-pregeneralized-plugin +gdal-plugin geofence-plugin geofence-server-plugin +geofence-wps-plugin geopkg-output-plugin grib-plugin gwc-s3-plugin h2-plugin imagemap-plugin importer-plugin +inspire-plugin jp2k-plugin +libjpeg-turbo-plugin mapml-plugin mbstyle-plugin metadata-plugin mongodb-plugin +monitor-plugin mysql-plugin netcdf-out-plugin netcdf-plugin @@ -28,14 +35,18 @@ ogr-wfs-plugin ogr-wps-plugin oracle-plugin params-extractor-plugin +printing-plugin +pyramid-plugin querylayer-plugin sldservice-plugin sqlserver-plugin +vectortiles-plugin wcs2_0-eo-plugin web-resource-plugin wmts-multi-dimensional-plugin wps-cluster-hazelcast-plugin wps-download-plugin wps-jdbc-plugin +wps-plugin xslt-plugin -ysld-plugin \ No newline at end of file +ysld-plugin diff --git a/scripts/env-data.sh b/scripts/env-data.sh index 1033c378..23a60def 100644 --- a/scripts/env-data.sh +++ b/scripts/env-data.sh @@ -378,3 +378,8 @@ if [ -z "${GEOSERVER_CONTEXT_ROOT}" ]; then # For runtime only, do not change at build-time. GEOSERVER_CONTEXT_ROOT=geoserver fi + +if [ -z "${SHOW_PASSWORD}" ]; then + # For runtime only, do not change at build-time. + SHOW_PASSWORD=true +fi diff --git a/scripts/start.sh b/scripts/start.sh index b6dafeea..8fb7a849 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -235,7 +235,10 @@ if [[ "${TOMCAT_EXTRAS}" =~ [Tt][Rr][Uu][Ee] ]]; then if [[ -z ${TOMCAT_PASSWORD} ]]; then generate_random_string 18 export TOMCAT_PASSWORD=${RAND} - echo -e "[Entrypoint] GENERATED tomcat PASSWORD: \e[1;31m $TOMCAT_PASSWORD \033[0m" + echo $TOMCAT_PASSWORD >${GEOSERVER_DATA_DIR}/security/tomcat_pass.txt + if [[ ${SHOW_PASSWORD} =~ [Tt][Rr][Uu][Ee] ]];then + echo -e "[Entrypoint] GENERATED tomcat PASSWORD: \e[1;31m $TOMCAT_PASSWORD \033[0m" + fi else export TOMCAT_PASSWORD=${TOMCAT_PASSWORD} fi diff --git a/scripts/update_passwords.sh b/scripts/update_passwords.sh index 0012f842..f6e65466 100644 --- a/scripts/update_passwords.sh +++ b/scripts/update_passwords.sh @@ -37,8 +37,10 @@ if [[ "${USE_DEFAULT_CREDENTIALS}" =~ [Ff][Aa][Ll][Ss][Ee] ]]; then generate_random_string 15 GEOSERVER_ADMIN_PASSWORD=${RAND} echo $GEOSERVER_ADMIN_PASSWORD >${GEOSERVER_DATA_DIR}/security/pass.txt - echo -e "\e[32m -------------------------------------------------------------------------------- \033[0m" - echo -e "[Entrypoint] GENERATED GeoServer Random PASSWORD is: \e[1;31m $GEOSERVER_ADMIN_PASSWORD \033[0m" + if [[ ${SHOW_PASSWORD} =~ [Tt][Rr][Uu][Ee] ]];then + echo -e "\e[32m -------------------------------------------------------------------------------- \033[0m" + echo -e "[Entrypoint] GENERATED GeoServer Random PASSWORD is: \e[1;31m $GEOSERVER_ADMIN_PASSWORD \033[0m" + fi fi USERS_XML=${USERS_XML:-${GEOSERVER_DATA_DIR}/security/usergroup/default/users.xml}