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.

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

GeoServer: enable metadata-plugin for modifying layer metadata, including bulk modifications #233

Merged
merged 9 commits into from
Aug 12, 2022
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.20.0
current_version = 1.20.1
commit = True
tag = False
tag_name = {new_version}
Expand Down
14 changes: 14 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,20 @@

[//]: # (list changes here, using '-' for each new entry, remove this when items are added)

[1.20.1](https://github.com/bird-house/birdhouse-deploy/tree/1.20.1) (2022-08-11)
------------------------------------------------------------------------------------------------------------------

## Changes:
- GeoServer: enable metadata-plugin for modifying layer metadata, including bulk modifications

See plugin documentation at https://docs.geoserver.org/2.19.x/en/user/community/metadata/index.html

Related to issue https://github.com/Ouranosinc/pavics-sdi/issues/234

Add new "Metadata" tab in Layer Edit page:
![Screenshot 2022-01-25 at 00-25-45 GeoServer Edit Layer](https://user-images.githubusercontent.com/11966697/150916419-fce99147-2903-414b-8b83-551709ef87d6.png)


[1.20.0](https://github.com/bird-house/birdhouse-deploy/tree/1.20.0) (2022-08-10)
------------------------------------------------------------------------------------------------------------------

Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ for a full-fledged production platform.
* - releases
- | |latest-version| |commits-since|

.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.20.0.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.20.1.svg
:alt: Commits since latest release
:target: https://github.com/bird-house/birdhouse-deploy/compare/1.20.0...master
:target: https://github.com/bird-house/birdhouse-deploy/compare/1.20.1...master

.. |latest-version| image:: https://img.shields.io/badge/tag-1.20.0-blue.svg?style=flat
.. |latest-version| image:: https://img.shields.io/badge/tag-1.20.1-blue.svg?style=flat
:alt: Latest Tag
:target: https://github.com/bird-house/birdhouse-deploy/tree/1.20.0
:target: https://github.com/bird-house/birdhouse-deploy/tree/1.20.1

.. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
:alt: ReadTheDocs Build Status (latest version)
Expand Down
3 changes: 2 additions & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ Vagrant.configure("2") do |config|
settings['datasets_dirs'].each do |mountpoint|
srcdir = mountpoint['srcdir']
destdir = mountpoint['destdir']
config.vm.synced_folder srcdir, destdir, mount_options: ["ro"]
mount_opts = mountpoint.fetch('mount_opts', "ro")
config.vm.synced_folder srcdir, destdir, mount_options: [mount_opts]
end
end

Expand Down
10 changes: 10 additions & 0 deletions birdhouse/config/geoserver/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Temp fix to avoid altering docker image on startup, which makes the image not reproducible.
# docker build -t pavics/geoserver:2.19.0-kartoza-build20210329-r2-with-snakeyaml .

FROM pavics/geoserver:2.19.0-kartoza-build20210329

# Add missing jar for the metadata-plugin.
# Should be fixed by newer version of Geoserver and matching new version of the plugin.
# https://osgeo-org.atlassian.net/browse/GEOS-10078
RUN wget https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.30/snakeyaml-1.30.jar \
-O /usr/local/tomcat/webapps/geoserver/WEB-INF/lib/snakeyaml-1.30.jar
1 change: 1 addition & 0 deletions birdhouse/config/geoserver/entrypointwrapper
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ if ! grep "<param-name>cors.allowed.methods</param-name>" $WEB_XML_FILE; then
diff -C 15 $ORIGINAL_WEB_XML_FILE $WEB_XML_FILE
fi


# chain existing entrypoint
/scripts/entrypoint.sh

Expand Down
4 changes: 2 additions & 2 deletions birdhouse/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export THREDDS_IMAGE="unidata/thredds-docker:4.6.18"
# Cache kartoza/geoserver docker build on pavics org since their tags are
# "moving" tags, meaning not reproducible behavior !
# See https://github.com/kartoza/docker-geoserver/issues/232#issuecomment-808754831
export GEOSERVER_IMAGE="pavics/geoserver:2.19.0-kartoza-build20210329"
export GEOSERVER_IMAGE="pavics/geoserver:2.19.0-kartoza-build20210329-r2-with-snakeyaml"

export BASH_IMAGE="bash:5.1.4"

Expand Down Expand Up @@ -84,7 +84,7 @@ export GEOSERVER_STABLE_EXTENSIONS="grib-plugin,netcdf-plugin,netcdf-out-plugin"

# Install the community edition plugins specified in
# https://github.com/kartoza/docker-geoserver/blob/master/build_data/community_plugins.txt
export GEOSERVER_COMMUNITY_EXTENSIONS="csw-iso-plugin,geopkg-plugin"
export GEOSERVER_COMMUNITY_EXTENSIONS="csw-iso-plugin,geopkg-plugin,metadata-plugin"

export GEOSERVER_DATA_DIR="$DATA_PERSIST_ROOT/geoserver"

Expand Down
7 changes: 4 additions & 3 deletions vagrant_variables.yml.example
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@ domain: ouranos.ca
# Force a default gateway if networking issue (ex: VM in a different DMZ VLan).
# default_gateway: 1.2.3.4

# Datasets dirs on the host to be mounted read-only into the VM at the same
# location, useful to avoid having to copy those gigantic netCDF files to the
# VM disk.
# Datasets dirs on the host to be mounted read-only, by default, into the VM
# at the same location, useful to avoid having to copy those gigantic netCDF
# files to the VM disk.
# Can use sshfs if the datasets are really large to avoid having to copy it
# locally. Ex:
# sshfs -o ro -o allow_other datahost:/mount/DATA /data/datasets
#datasets_dirs:
# - { srcdir: "/data/datasets", destdir: "/data/datasets" }
# - { srcdir: "/data/datasets-priv", destdir: "/data/datasetsPrivate" }
# - { srcdir: "C:/data/datasets", destdir: "/data/datasets" }
# - { srcdir: "/data/geoserver.clone", destdir: "/data/geoserver", mount_opts: "rw" }

# If you want to provide a SSL certificate yourself, name it
# '/home/vagrant/certkey.pem' and it won't be overriden, see
Expand Down