Merge pull request #617 from eea/develop

Develop
eea · Sep 19, 2024 · 28b322c · 28b322c
2 parents 8adb9e0 + b9b8a04
commit 28b322c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,21 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-### [3.324.0](https://github.com/eea/clms-frontend/compare/3.323.0...3.324.0) - 10 September 2024
+### [3.325.0](https://github.com/eea/clms-frontend/compare/3.324.0...3.325.0) - 19 September 2024
 
 #### :rocket: Dependency updates
 
-- Release @eeacms/volto-arcgis-block@0.1.303 [EEA Jenkins - [`806cabe`](https://github.com/eea/clms-frontend/commit/806cabe0afb43cbb2b3f60a2a9e112cd00864588)]
+- Release @eeacms/volto-clms-theme@1.1.186 [EEA Jenkins - [`2687f4d`](https://github.com/eea/clms-frontend/commit/2687f4d212930aae5d436ba8c49d463a0fd86795)]
+- Release @eeacms/volto-arcgis-block@0.1.304 [EEA Jenkins - [`d8a599a`](https://github.com/eea/clms-frontend/commit/d8a599af61c6c53e44f87287be5f942b4f04fc9a)]
+
+#### :house: Documentation changes
+
+- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`074324d`](https://github.com/eea/clms-frontend/commit/074324d376503e782531ccdca23a221074cfc6ec)]
+
+#### :hammer_and_wrench: Others
+
+- Refs #161485 - Update docker-compose.example.yml - fix build path and volumes (sources, sources.ini). [GhitaB - [`13b9b3c`](https://github.com/eea/clms-frontend/commit/13b9b3ccb01e8e0d0ccaa155260c0fed1d4ea1cc)]
+### [3.324.0](https://github.com/eea/clms-frontend/compare/3.323.0...3.324.0) - 10 September 2024
 
 #### :house: Documentation changes
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![Release](https://img.shields.io/github/v/release/eea/clms-frontend?sort=semver)](https://github.com/eea/clms-frontend/releases)
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto/clms-frontend/master&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/clms-frontend/job/master/display/redirect)
 [![Pipeline develop](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fclms-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/clms-frontend/job/develop/lastBuild/display/redirect)
-[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fclms-frontend%2F3.324.0&build=last&subject=release%20v3.324.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/clms-frontend/job/3.324.0/lastBuild/display/redirect/)
+[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fclms-frontend%2F3.325.0&build=last&subject=release%20v3.325.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/clms-frontend/job/3.325.0/lastBuild/display/redirect/)
 
 ## [CLMS Installation](https://github.com/eea/clms-frontend/blob/develop/CLMS_INSTALL.md) full guide
 ## Backend

diff --git a/docker-compose.example.yml b/docker-compose.example.yml
@@ -15,12 +15,11 @@ services:
 
   backend:
     entrypoint: sh -c "tail -f /dev/null"
-    build: ./eea.docker.plone.clms/develop/
+    build: ./eea.docker.plone.clms/docker/
     environment:
       SITE: Plone
       PROFILES: 'clms.addon:default clms.downloadtool:default clms.statstool:default clms.types:default eea.volto.policy:default collective.volto.cookieconsent:default collective.volto.dropdownmenu:default'
     volumes:
       - ./data:/data
-      #- ./sources:/app/sources
-      - ./sources:/app/dev-sources
-      - ./eea.docker.plone.clms/develop:/app/develop
+      - ./eea.docker.plone.clms/docker/sources.ini:/app/sources.ini
+      - ./eea.docker.plone.clms/sources:/app/sources
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "clms-frontend",
   "description": "Volto Frontend for CLMS site",
   "license": "MIT",
-  "version": "3.324.0",
+  "version": "3.325.0",
   "private": true,
   "workspaces": [
     "src/addons/volto-arcgis-block",
@@ -168,8 +168,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.20.6",
-    "@eeacms/volto-arcgis-block": "0.1.303",
-    "@eeacms/volto-clms-theme": "1.1.185",
+    "@eeacms/volto-arcgis-block": "0.1.304",
+    "@eeacms/volto-clms-theme": "1.1.186",
     "@eeacms/volto-eea-kitkat": "^24.0.1",
     "@eeacms/volto-sentry-rancher-config": "5.0.0",
     "@plone/volto": "16.31.1",

diff --git a/yarn.lock b/yarn.lock
@@ -1767,9 +1767,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eeacms/volto-arcgis-block@npm:0.1.303":
-  version: 0.1.303
-  resolution: "@eeacms/volto-arcgis-block@npm:0.1.303"
+"@eeacms/volto-arcgis-block@npm:0.1.304":
+  version: 0.1.304
+  resolution: "@eeacms/volto-arcgis-block@npm:0.1.304"
   dependencies:
     "@eeacms/volto-clms-utils": ^0.1.13
     "@fortawesome/fontawesome-svg-core": 1.2.35
@@ -1779,7 +1779,7 @@ __metadata:
     highcharts: ^9.3.2
     highcharts-react-official: ^3.1.0
     react-datepicker: 4.10.0
-  checksum: 6f5bc66a1ede39c25253f9c65d17ec3dbddab6d2dc5265815c5f76d19ef4abb81129f68265cd1e784ce20d537184e75a3c866348073164735c48dcd505a95425
+  checksum: 7e05ca7d88c4d0aa1573768d6bec3ff0a7a8dc2a714371e3a53d00b205146fe938980d1544c3de231fa8711a9a778868766e1fa3f8447dab7316c0233fa3d305
   languageName: node
   linkType: hard
 
@@ -1857,9 +1857,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eeacms/volto-clms-theme@npm:1.1.185":
-  version: 1.1.185
-  resolution: "@eeacms/volto-clms-theme@npm:1.1.185"
+"@eeacms/volto-clms-theme@npm:1.1.186":
+  version: 1.1.186
+  resolution: "@eeacms/volto-clms-theme@npm:1.1.186"
   dependencies:
     "@eeacms/volto-accordion-block": 7.0.0
     "@eeacms/volto-arcgis-block": "*"
@@ -1895,7 +1895,7 @@ __metadata:
     volto-cookie-banner: 2.1.0
     volto-dropdownmenu: 4.0.0
     volto-form-block: 3.0.1
-  checksum: 8c507ea65818bfd8d74de6b56d9e17d482e5bf11f362e13329338a589cef9d778f43aa0749c051c26affa012cd4adec423b1ae408e6f657669a0b9e9184aabe6
+  checksum: f690669e548a0ce76a9b50ce94908ec93851b859c1b05438dd60fa7d1a6594bd210461f117c149919d31736ef9e139797fd51160a0eea05519d975c0f16a3e40
   languageName: node
   linkType: hard
 
@@ -6810,8 +6810,8 @@ __metadata:
   resolution: "clms-frontend@workspace:."
   dependencies:
     "@babel/runtime": 7.20.6
-    "@eeacms/volto-arcgis-block": 0.1.303
-    "@eeacms/volto-clms-theme": 1.1.185
+    "@eeacms/volto-arcgis-block": 0.1.304
+    "@eeacms/volto-clms-theme": 1.1.186
     "@eeacms/volto-eea-kitkat": ^24.0.1
     "@eeacms/volto-sentry-rancher-config": 5.0.0
     "@eeacms/volto-widget-geolocation": ^3.0.0