Fix #10947 Updated dockerfile to static files for standard templates by MV88 · Pull Request #10950 · geosolutions-it/MapStore2

MV88 · 2025-03-20T15:16:37Z

Description

Fixing the dockerfile for projects

# COPY binary/tomcat/conf/server.xml "${CATALINA_BASE}/conf/"
# RUN sed -i -e 's/8082/8080/g' ${CATALINA_BASE}/conf/server.xml

this is the only chagned part from original dockerfile

Please check if the PR fulfills these requirements

The commit message follows our guidelines: https://github.com/geosolutions-it/MapStore2/blob/master/CONTRIBUTING.md
Tests for the changes have been added (for bug fixes / features)
Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce? (check one with "x", remove the others)

Issue

What is the current behavior?

Fix #10947

What is the new behavior?

Breaking change

Does this PR introduce a breaking change? (check one with "x", remove the other)

Yes, and I documented them in migration notes
No

Other useful information

…dard templates

offtherailz

I put some notes, because if we want to provide docker file for projects, we have several bugs.
Probably this was a problem existing before your contribution, but we have to take into account to avoid this (unuseful) feature for project, if it not makes sense.

offtherailz · 2025-04-07T14:56:57Z

project/standard/static/Dockerfile

@@ -0,0 +1,50 @@
+FROM tomcat:9-jdk11 AS mother
+LABEL maintainer="Alessandro Parma<alessandro.parma@geosolutionsgroup.com>"


This is for a project, so the maintainer should be removed.

offtherailz · 2025-04-07T15:00:42Z

project/standard/static/Dockerfile

@@ -0,0 +1,50 @@
+FROM tomcat:9-jdk11 AS mother
+LABEL maintainer="Alessandro Parma<alessandro.parma@geosolutionsgroup.com>"
+ARG MAPSTORE_WEBAPP_SRC="https://github.com/geosolutions-it/MapStore2/releases/latest/download/mapstore.war"


This will copy mapstore from latest release. This is not what we want for project, or it is unuseful and they can take directly the docker container from dockerhub.
By the way, if this is the standard docker file, a future build of the docker will build always against the altest version, and this is not what we want. So this looks to be a bug of the current dockerfile too.

offtherailz · 2025-04-07T15:01:16Z

project/standard/templates/Dockerfile

@@ -0,0 +1,50 @@
+FROM tomcat:9-jdk11 AS mother
+LABEL maintainer="Alessandro Parma<alessandro.parma@geosolutionsgroup.com>"


same here, remove maintainer (2 copies, why)?

since is present in the static folder i think we can safely remove it from here

offtherailz · 2025-04-07T15:01:50Z

project/standard/templates/Dockerfile

@@ -0,0 +1,50 @@
+FROM tomcat:9-jdk11 AS mother
+LABEL maintainer="Alessandro Parma<alessandro.parma@geosolutionsgroup.com>"
+ARG MAPSTORE_WEBAPP_SRC="https://github.com/geosolutions-it/MapStore2/releases/latest/download/mapstore.war"


same here, file downloads the latest mapstore, so dockerfile is unuseful in this case.
(2 copies of same docker file, too).

will remove this file

offtherailz · 2025-04-07T15:50:33Z

@tdipisa let's evaluate if makes sense to delay this to next release, and assign it to a devops.
We should :

include in the build the current built war (for mapstore, that looks now to download only latest war)
also in project, same logic. The current project war

MV88 · 2025-04-09T13:59:27Z

I put some notes, because if we want to provide docker file for projects, we have several bugs. Probably this was a problem existing before your contribution, but we have to take into account to avoid this (unuseful) feature for project, if it not makes sense.

@tdipisa @offtherailz
this happened because in one of the latest projects we had, our devop took dockerfile from main mapstore, so if we need a dedicated version for projects then yes, it might be better assigned to a devop

What should i do here other than removing a duplication?

offtherailz · 2025-04-09T14:12:25Z

It is needed to :

set MAPSTORE_WEBAPP_SRC to the default mapstore.war file of the project and it should work
we need to document it properly (E.g. build before to run docker build ).
the same for mapstore, MAPSTORE_WEBAPP_SRC should be set to product/target/mapstore.war or whatever it is, and properly docuemnt it too.

offtherailz

I removed the docker file at all, and opened a dedicated issue to do it in a proper way, with layers and/or using the current war by default instead of the release's one.

In the meantime I remove the docker file from projects, that doesn't respond on same standards (e.g. hiding tomcat version, as it is done by copying the binary's version of server.xml ) .

Here the issue.
#11127

offtherailz · 2025-05-21T16:00:04Z

No need to test @ElenaGallo . It is a build thing.
We removed docker from project, that was wrong and misleading.

tdipisa · 2025-05-21T16:07:17Z

@offtherailz the backport need to be done anyway, I guess...

offtherailz · 2025-05-21T16:10:03Z

@MV88 I think you can backport

…dard templates (geosolutions-it#10950)

…10950) (#11135)

* Fix geosolutions-it#10819 Manager menu is merged into Login/user menu and Manager menu is now deprecated (geosolutions-it#10963) * Small update to LDAP doc (geosolutions-it#10972) * Fixing http-proxy version to 1.5.0 (geosolutions-it#10905) * Streetsmart openid master (geosolutions-it#10875) (geosolutions-it#10994) * geosolutions-it#10983: handle add new X twitter icon instead of old icon in Share-->Social (geosolutions-it#10988) (geosolutions-it#10995) Description: - add new x icon of x.com [twitter] in share panel * geosolutions-it#10986: Remove experimentalInteractiveLegend flag (geosolutions-it#10993) (geosolutions-it#11000) * Fix geosolutions-it#10898 Removed dependency BrandNavbar from both ResourceDetails and Language while creating map context (geosolutions-it#10978) (geosolutions-it#11001) * Fix geosolutions-it#10819 Changed migration guide and jsdoc for rules manager. (geosolutions-it#10984) (geosolutions-it#11002) * Fix geosolutions-it#10944 Remove primary color and shadow from panels headers (geosolutions-it#10956) (geosolutions-it#11006) --------- Co-authored-by: allyoucanmap <stefano.bovio@geosolutionsgroup.com> * geosolutions-it#10831: FIX- Improve how printing map preview is managed (geosolutions-it#10957) (geosolutions-it#11020) * geosolutions-it#10970: Add configuration support to open resource in target from homepage (geosolutions-it#10977) (geosolutions-it#11019) (cherry picked from commit b735d26) * [Backport 2025.01.xx] geosolutions-it#10820 Refactored Admin Ui section like HomePage using ResourceGrid Plugin (geosolutions-it#10973) (geosolutions-it#11023) * fix: merge conflict in index:ResourceCatalog * fix: conflict : removed ResourcesSearch * Fix:geosolutions-it#10820 double close icon in add new group dialog (geosolutions-it#11018) (geosolutions-it#11025) * [Backport 2025.01.xx] Fix geosolutions-it#10774 Review position of the filter button and search field in the homepage (geosolutions-it#11031) * Fix geosolutions-it#10774 Review position of the filter button and search field in the homepage (geosolutions-it#11005) * Fix geosolutions-it#10774 Clear all filters inside the resource search bar (geosolutions-it#11013) * Fix geosolutions-it#11010 Vertical scrollbar on map viewer (geosolutions-it#11015) (geosolutions-it#11032) * Fix geosolutions-it#11011 Map templates infinite scroll request all the pages (geosolutions-it#11014) (geosolutions-it#11033) * Fix geosolutions-it#10958 Clean up old packages and deps (geosolutions-it#10959) (geosolutions-it#11068) * geosolutions-it#11021: Implement an option to have static WMS legends (geosolutions-it#11034) (geosolutions-it#11074) (cherry picked from commit d28bf70) * [Backport to 2025.01.xx][FIXES geosolutions-it#11057] Latest MS binary of 2025.01 series does not start (geosolutions-it#11072) (geosolutions-it#11078) * Fix geosolutions-it#11064. Restored arguments for login event (geosolutions-it#11066) (geosolutions-it#11079) * Fix geosolutions-it#11058 .prettierignore improvements (geosolutions-it#11059) (geosolutions-it#11080) This changes include updates and documentation of `.prettierignore` file and json files in order to: - Prevent geosolutions-it#11058 error and any error due to target dirs - Include files that must be checked (fixing the missing ones) - Properly organize and document exclusion for future work * [Backport 2025.01.xx] Fix geosolutions-it#10990 Review resources catalog code to make it usable by GeoStore and GeoNode geosolutions-it#10991 (geosolutions-it#11089) --------- Co-authored-by: stefano bovio <stefano.bovio@geosolutionsgroup.com> * Fix prod config (geosolutions-it#11091) * Revert bump of mapstore-services to 1.9-SNAPSHOT (geosolutions-it#11094) * Fix prod config * Revert "Bump versions on master for release-branch (geosolutions-it#10904)" This reverts commit 3ceca0a. * update deps on stable branch 2025.01.xx for standard template web/pom.xml (geosolutions-it#11096) * Fix geosolutions-it#11086 IFC position controller no longer working (geosolutions-it#11090) (geosolutions-it#11101) * [Backport 2025.01.xx]: Fix geosolutions-it#11081 Minor home page issues to fix (geosolutions-it#11095) (geosolutions-it#11102) * Minor home page issues to fix geosolutions-it#11081 (geosolutions-it#11095) * fix: use update_resource and remove favouriteChanged action (geosolutions-it#11100) * Adding missing translation property geosolutions-it#11106 * Fix geosolutions-it#11099 Align the behavior of contexts management on the front end to the backend model (geosolutions-it#11108) (geosolutions-it#11122) * Fix geosolutions-it#10739 Changing correctly resolutions limits when switching map CRS (geosolutions-it#10746) (geosolutions-it#11123) * Fix geosolutions-it#10739 Changing correctly resolutions limits when switching map CRS * fix lint * Fix same visibility limit * Fix geosolutions-it#11097 Confirmation modal should not appear if no changes are made (geosolutions-it#11125) (geosolutions-it#11134) * Fix geosolutions-it#10947 Updated dockerfile to static files for standard templates (geosolutions-it#10950) (geosolutions-it#11135) * [Backport 2025.01.xx] upgrade spring framework to version 5.3.39 (geosolutions-it#11035) (geosolutions-it#11128) * upgrade spring framework to version 5.3.39 (geosolutions-it#11035) * Fixed geostore version * Update pom.xml Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> * [2025.01.xx] upgrade spring framework to version 5.3.39 (geosolutions-it#11035) (geosolutions-it#11145) * Update pom.xml --------- Co-authored-by: Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> * [Backport to 2025.01.xx] Keep commons-lang 2 for back compatibility with old catalina versions (geosolutions-it#11161) * [Backport 2025.01.xx] Fix geosolutions-it#10982 Side panels should be smaller (geosolutions-it#11172) * Fix geosolutions-it#10982 Side panels should be smaller (geosolutions-it#11009) * #geosolutions-it#10982 Side panels should be smaller * fix failing tests * requested changes * Fix geosolutions-it#10982 Review style of longitudinal profile chart (geosolutions-it#11151) * [Backport 2025.01.xx] Fix geosolutions-it#11147 Problems with save resource workflow (geosolutions-it#11170) * Fix geosolutions-it#11147 Problems with save resource workflow (geosolutions-it#11149) * Fix geosolutions-it#11147 Ensure thumbnail is persisted in UI while editing (geosolutions-it#11166) * Fix geosolutions-it#11146 Edit permission to everyone should not be set (geosolutions-it#11150) (geosolutions-it#11171) * Improve GeoServer user integration doc (geosolutions-it#11030) (geosolutions-it#11169) * Improve GeoServer user integration doc * Update docs/developer-guide/integrations/geoserver.md --------- Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> * backport 2025.01.xx - Fix geosolutions-it#11176 adding version template and updated pom versions (geosolutions-it#11178) (geosolutions-it#11180) * Fix geosolutions-it#11176 adding version template and updated pom versions (geosolutions-it#11178) * fix geostore-webapp.version * Update User Guide - User Session plugin (geosolutions-it#11115) (geosolutions-it#11185) * update_10934 * Update docs/user-guide/user-session.md * Update docs/user-guide/user-session.md --------- Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> * Update User Guide - Upload image on Text Widget (geosolutions-it#11024) (geosolutions-it#11186) * updateguide_10752 * Update docs/user-guide/widgets.md --------- Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> * 11073_update (geosolutions-it#11107) (geosolutions-it#11187) * Update User Guide - Configure the light on Cesium map (geosolutions-it#11126) (geosolutions-it#11184) * update_10844 * Update docs/user-guide/mapstore-toolbars.md * Update docs/user-guide/mapstore-toolbars.md * Update docs/user-guide/mapstore-toolbars.md --------- Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> * review_10929 (geosolutions-it#11188) * Update User Guide - Legend filtering for WMS layers (geosolutions-it#11026) (geosolutions-it#11189) * updateguide_10740 * review_10740 * Update docs/user-guide/toc.md --------- Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> * User Guide - Add User Session plugin section geosolutions-it#11190 (geosolutions-it#11191) * Set versions of main dependencies (geostore, mapfish, http-proxy) (geosolutions-it#11193) Co-authored-by: github-actions <github-actions@github.com> * Fix style parser import of font-awsome (geosolutions-it#11195) (geosolutions-it#11196) * Version Release 2025.01.00 * Restore java packages to 1.9-SNAPSHOT and update package.json * geosolutions-it#11153: Persist Swipe Layer state after map refresh (geosolutions-it#11158) (geosolutions-it#11202) * geosolutions-it#11153: Persist Swipe Layer state after map refresh - handle save swipe data into mapsave - handle setting the swipe saved data into swipe state after map config load - handle detect swipe change for save map - add unit tests * resolve review comments include: - use registerCustomSaveHandler instead of using basicMapOptionsToSaveSelector to save swipe state * Update web/client/selectors/swipe.js --------- Co-authored-by: Suren <dsuren1@gmail.com> * Revert "geosolutions-it#11153: Persist Swipe Layer state after map refresh (geosolutions-it#11158) (geosolutions-it#11202)" (geosolutions-it#11204) This reverts commit 644bb7b. * [Backport to 2025.01.xx][geosolutions-it#11205] MapStore war stand-alone not starting (geosolutions-it#11208) * [geosolutions-it#11205] MapStore war stand-alone not starting * Build fix (cherry picked from commit c2852fd) * Get rid of duplicate httpclient httpcore 4.4.15 deps * Fixing failing tests due to timeout (geosolutions-it#11216) (geosolutions-it#11217) * Removed changelog * Version Release 2025.01.00 * Submodule sync v2025.01.00 (#46) * Update db properties and backend port (#37) * Adding Vulnerability Fixes (#38) * Updated pom.xml files to fix vulnerabilities * Updated spring.security.version * Bump versions for tomcat and cxf-core (#39) * pom updates * removing duplicate ip * fixed port for embedded tomcat --------- Co-authored-by: Anup Dahal <adahal39@gmail.com> Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> Co-authored-by: Lorenzo Natali <lorenzo.natali@geosolutionsgroup.com> Co-authored-by: mahmoud adel <58145645+mahmoudadel54@users.noreply.github.com> Co-authored-by: allyoucanmap <stefano.bovio@geosolutionsgroup.com> Co-authored-by: Suren <dsuren1@gmail.com> Co-authored-by: Matteo V. <matteo.velludini@geosolutionsgroup.com> Co-authored-by: Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Co-authored-by: RowHeat <40065760+rowheat02@users.noreply.github.com> Co-authored-by: ElenaGallo <56537133+ElenaGallo@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Raul Melara Beckman <101594967+rmelarab-ngs@users.noreply.github.com>

Fix geosolutions-it#10947 Updated dockerfile to static files for stan…

9bc8fe5

…dard templates

MV88 added the bug label Mar 20, 2025

MV88 added this to the 2025.01.00 milestone Mar 20, 2025

MV88 requested a review from offtherailz March 20, 2025 15:16

MV88 self-assigned this Mar 20, 2025

fix prod project

6bb39bd

tdipisa added the BackportNeeded Commits provided for an issue need to be backported to the milestone's stable branch label Apr 4, 2025

offtherailz requested changes Apr 7, 2025

View reviewed changes

tdipisa modified the milestones: 2025.01.00, 2025.01.01 Apr 9, 2025

update after review first part

c89fb6e

Delete project/standard/static/Dockerfile

652f28b

offtherailz self-requested a review May 21, 2025 13:31

offtherailz approved these changes May 21, 2025

View reviewed changes

offtherailz enabled auto-merge (squash) May 21, 2025 13:32

offtherailz merged commit 94d9822 into geosolutions-it:master May 21, 2025
5 checks passed

MV88 added a commit to MV88/MapStore2 that referenced this pull request May 23, 2025

Fix geosolutions-it#10947 Updated dockerfile to static files for stan…

e171356

…dard templates (geosolutions-it#10950)

tdipisa removed the BackportNeeded Commits provided for an issue need to be backported to the milestone's stable branch label May 23, 2025

tdipisa pushed a commit that referenced this pull request May 23, 2025

Fix #10947 Updated dockerfile to static files for standard templates (#…

9c1f9eb

…10950) (#11135)

		@@ -0,0 +1,50 @@
		FROM tomcat:9-jdk11 AS mother
		LABEL maintainer="Alessandro Parma<alessandro.parma@geosolutionsgroup.com>"

Conversation

MV88 commented Mar 20, 2025

Description

Issue

Breaking change

Other useful information

Uh oh!

offtherailz left a comment

Choose a reason for hiding this comment

Uh oh!

offtherailz Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

offtherailz Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

offtherailz Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

MV88 Apr 9, 2025

Choose a reason for hiding this comment

Uh oh!

offtherailz Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

MV88 Apr 9, 2025

Choose a reason for hiding this comment

Uh oh!

offtherailz commented Apr 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MV88 commented Apr 9, 2025

Uh oh!

offtherailz commented Apr 9, 2025

Uh oh!

offtherailz left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

offtherailz commented May 21, 2025

Uh oh!

tdipisa commented May 21, 2025

Uh oh!

offtherailz commented May 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

offtherailz commented Apr 7, 2025 •

edited

Loading

offtherailz left a comment •

edited

Loading