Remove unused geoserver dockerfiles #353

tlvu · 2023-07-12T21:21:15Z

Delete unused Dockerfiles, fixes 🛡️ [Security] Remove deprecated GeoServer #349 and fixes [Snyk] Security upgrade tomcat from 8.0-jre8 to 8.5.91-jre8 #352
- birdhouse/docker/geoserver: not used since 3-4 years, replaced by https://github.com/kartoza/docker-geoserver
- birdhouse/config/geoserver/Dockerfile: was introduced in commit f3b9896 (PR GeoServer: enable metadata-plugin for modifying layer metadata, including bulk modifications #233, merge commit d1ecc63) as a temporary solution only, not needed with newer kartoza docker images.
Move birdhouse/docker/solr to birdhouse/deprecated-components/solr/docker to group related files together. Solr has been deprecated since PR Deprecated unused/unmaintained components #311 (merge commit a8d3612).

Replaced by https://github.com/kartoza/docker-geoserver

…n commit f3b9896 In PR #233, commit d1ecc63 as a temporary solution only, not needed with newer kartoza docker images.

…cker To group related files together. Solr has been deprecated since PR #311 (commit a8d3612)

crim-jenkins-bot · 2023-07-12T22:10:34Z

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1813/
Result : failure

BIRDHOUSE_DEPLOY_BRANCH : remove-unused-geoserver-dockerfile
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

DESTROY_INFRA_ON_EXIT : true
PAVICS_HOST : https://host-140-88.rdext.crim.ca

PAVICS-e2e-workflow-tests Pipeline Results

Tests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/1216/

NOTEBOOK TEST RESULTS

    
[2023-07-12T21:35:42.928Z] ============================= test session starts ==============================
[2023-07-12T21:35:42.928Z] platform linux -- Python 3.9.16, pytest-7.3.1, pluggy-1.0.0
[2023-07-12T21:35:42.928Z] rootdir: /home/jenkins/agent/workspace/PAVICS-e2e-workflow-tests_master
[2023-07-12T21:35:42.928Z] plugins: anyio-3.6.1, dash-2.10.0, nbval-0.9.6, tornasync-0.6.0.post2, xdist-3.3.1
[2023-07-12T21:35:42.928Z] collected 236 items
[2023-07-12T21:35:42.928Z] 
[2023-07-12T21:35:51.001Z] notebooks-auth/test_thredds.ipynb ...........                            [  4%]
[2023-07-12T21:35:55.759Z] pavics-sdi-master/docs/source/notebooks/WCS_example.ipynb .FFFFF.        [  7%]
[2023-07-12T21:36:05.439Z] pavics-sdi-master/docs/source/notebooks/WFS_example.ipynb ......         [ 10%]
[2023-07-12T21:36:13.949Z] pavics-sdi-master/docs/source/notebooks/WMS_example.ipynb ........       [ 13%]
[2023-07-12T21:43:37.490Z] pavics-sdi-master/docs/source/notebooks/climex.ipynb ............        [ 18%]
[2023-07-12T21:43:38.883Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-climate-stations.ipynb . [ 19%]
[2023-07-12T21:43:46.643Z] ...............                                                          [ 25%]
[2023-07-12T21:43:55.015Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-xclim.ipynb .....    [ 27%]
[2023-07-12T21:44:01.948Z] pavics-sdi-master/docs/source/notebooks/esgf-dap.ipynb ......            [ 30%]
[2023-07-12T21:44:16.882Z] pavics-sdi-master/docs/source/notebooks/forecasts.ipynb ......           [ 32%]
[2023-07-12T21:44:18.541Z] pavics-sdi-master/docs/source/notebooks/jupyter_extensions.ipynb .       [ 33%]
[2023-07-12T21:44:23.603Z] pavics-sdi-master/docs/source/notebooks/opendap.ipynb .......            [ 36%]
[2023-07-12T21:44:28.018Z] pavics-sdi-master/docs/source/notebooks/pavics_thredds.ipynb .....       [ 38%]
[2023-07-12T21:48:07.005Z] pavics-sdi-master/docs/source/notebooks/regridding.ipynb ............... [ 44%]
[2023-07-12T21:49:07.396Z] .............                                                            [ 50%]
[2023-07-12T21:49:11.593Z] pavics-sdi-master/docs/source/notebooks/rendering.ipynb ....             [ 51%]
[2023-07-12T21:49:13.802Z] pavics-sdi-master/docs/source/notebooks/subset-user-input.ipynb ........ [ 55%]
[2023-07-12T21:49:29.613Z] .................                                                        [ 62%]
[2023-07-12T21:49:38.206Z] pavics-sdi-master/docs/source/notebooks/subsetting.ipynb ....F.          [ 64%]
[2023-07-12T21:49:39.587Z] pavics-sdi-master/docs/source/notebook-components/weaver_example.ipynb . [ 65%]
[2023-07-12T21:49:54.874Z] ..F......                                                                [ 69%]
[2023-07-12T21:50:03.937Z] finch-master/docs/source/notebooks/dap_subset.ipynb ...........          [ 73%]
[2023-07-12T21:50:13.662Z] finch-master/docs/source/notebooks/finch-usage.ipynb ......              [ 76%]
[2023-07-12T21:50:15.052Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-1DataAccess.ipynb . [ 76%]
[2023-07-12T21:50:18.694Z] ......                                                                   [ 79%]
[2023-07-12T21:50:25.293Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-2Subsetting.ipynb . [ 79%]
[2023-07-12T21:50:40.870Z] .............                                                            [ 85%]
[2023-07-12T21:50:50.866Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-3Climate-Indicators.ipynb . [ 85%]
[2023-07-12T21:51:24.740Z] ....s.                                                                   [ 88%]
[2023-07-12T21:51:32.864Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-4Ensembles.ipynb . [ 88%]
[2023-07-12T21:51:44.765Z] ...                                                                      [ 89%]
[2023-07-12T21:51:59.667Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-5Visualization.ipynb . [ 90%]
[2023-07-12T21:52:19.433Z] ......                                                                   [ 92%]
[2023-07-12T21:52:22.177Z] notebooks/hummingbird.ipynb ............                                 [ 97%]
[2023-07-12T21:55:26.600Z] notebooks/stress-tests.ipynb .....                                       [100%]
[2023-07-12T21:55:26.601Z] 
[2023-07-12T21:55:26.601Z] =================================== FAILURES ===================================

fmigneault

Just got some formatting issues in the change logs.

The features themselves are good.

fmigneault · 2023-07-12T22:19:09Z

CHANGES.md

-[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
+## Changes
+
+- Delete unused Dockerfiles, fixes #349 and #352


PR numbers and commit hash should use the full URL for generated docs (here and below)

fmigneault · 2023-07-12T22:20:19Z

CHANGES.md

+  * birdhouse/docker/geoserver: not used since 3-4 years, replaced by https://github.com/kartoza/docker-geoserver
+
+  * birdhouse/config/geoserver/Dockerfile: was introduced in commit f3b9896e6b771e0aff62c6851c2376d730ddadaf


use code format for paths

fmigneault · 2023-07-12T22:21:13Z

CHANGES.md

+    (PR #233, commit d1ecc63284ec9d2940bfa2b1b4baca3fbe1308b3) as a temporary
+    solution only, not needed with newer kartoza docker images.
+
+- Move birdhouse/docker/solr to birdhouse/deprecated-components/solr/docker


Use the path reference format (see example in below version).

…rver-dockerfile

tlvu · 2023-08-28T17:27:05Z

Not tagging since this do not have any active code change. This is akin to simple documentation change.

crim-jenkins-bot · 2023-08-28T17:36:15Z

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1987/
Result : failure

BIRDHOUSE_DEPLOY_BRANCH : remove-unused-geoserver-dockerfile
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

DESTROY_INFRA_ON_EXIT : true
PAVICS_HOST : https://host-140-20.rdext.crim.ca

PAVICS-e2e-workflow-tests Pipeline Results

Tests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/1274/

NOTEBOOK TEST RESULTS

    
[2023-08-28T17:32:09.659Z] ============================= test session starts ==============================
[2023-08-28T17:32:09.659Z] platform linux -- Python 3.9.16, pytest-7.3.1, pluggy-1.0.0
[2023-08-28T17:32:09.659Z] rootdir: /home/jenkins/agent/workspace/PAVICS-e2e-workflow-tests_master
[2023-08-28T17:32:09.659Z] plugins: anyio-3.6.1, dash-2.10.0, nbval-0.9.6, tornasync-0.6.0.post2, xdist-3.3.1
[2023-08-28T17:32:09.659Z] collected 0 items
[2023-08-28T17:32:09.659Z] 
[2023-08-28T17:32:09.659Z] ============================ no tests ran in 0.01s =============================

crim-jenkins-bot · 2023-08-28T17:36:53Z

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1988/
Result : failure

BIRDHOUSE_DEPLOY_BRANCH : remove-unused-geoserver-dockerfile
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

DESTROY_INFRA_ON_EXIT : true
PAVICS_HOST : https://host-140-35.rdext.crim.ca

PAVICS-e2e-workflow-tests Pipeline Results

Tests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/1275/

NOTEBOOK TEST RESULTS

    
[2023-08-28T17:32:46.912Z] ============================= test session starts ==============================
[2023-08-28T17:32:46.912Z] platform linux -- Python 3.9.16, pytest-7.3.1, pluggy-1.0.0
[2023-08-28T17:32:46.912Z] rootdir: /home/jenkins/agent/workspace/PAVICS-e2e-workflow-tests_master@2
[2023-08-28T17:32:46.912Z] plugins: anyio-3.6.1, dash-2.10.0, nbval-0.9.6, tornasync-0.6.0.post2, xdist-3.3.1
[2023-08-28T17:32:46.912Z] collected 0 items
[2023-08-28T17:32:46.912Z] 
[2023-08-28T17:32:46.912Z] ============================ no tests ran in 0.01s =============================

tlvu added 3 commits July 12, 2023 16:55

Delete unused birdhouse/docker/geoserver: not used since 3-4 years

2e526ae

Replaced by https://github.com/kartoza/docker-geoserver

Delete unused birdhouse/config/geoserver/Dockerfile: was introduced i…

2674949

…n commit f3b9896 In PR #233, commit d1ecc63 as a temporary solution only, not needed with newer kartoza docker images.

Move birdhouse/docker/solr to birdhouse/deprecated-components/solr/do…

888d3d1

…cker To group related files together. Solr has been deprecated since PR #311 (commit a8d3612)

tlvu requested review from mishaschwartz and fmigneault July 12, 2023 21:21

github-actions bot added ci/operations Continuous Integration components component/geoserver Related to GeoServer or one of its underlying services documentation Improvements or additions to documentation labels Jul 12, 2023

This was referenced Jul 12, 2023

[Snyk] Security upgrade tomcat from 8.0-jre8 to 8.5.90-jre8 #351

Closed

[Snyk] Security upgrade tomcat from 8.0-jre8 to 8.5.91-jre8 #352

Closed

fmigneault reviewed Jul 12, 2023

View reviewed changes

fmigneault assigned fmigneault and tlvu and unassigned fmigneault Jul 12, 2023

mishaschwartz approved these changes Jul 13, 2023

View reviewed changes

tlvu mentioned this pull request Aug 28, 2023

[Snyk] Security upgrade tomcat from 8.0-jre8 to 8.5.92-jre8 #377

Closed

tlvu added 2 commits August 28, 2023 13:12

CHANGES: use full url for generated docs

01120da

Merge remote-tracking branch 'origin/master' into remove-unused-geose…

1e4f79c

…rver-dockerfile

tlvu merged commit f170664 into master Aug 28, 2023
3 checks passed

tlvu deleted the remove-unused-geoserver-dockerfile branch August 28, 2023 17:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove unused geoserver dockerfiles #353

Remove unused geoserver dockerfiles #353

tlvu commented Jul 12, 2023 •

edited

Loading

crim-jenkins-bot commented Jul 12, 2023

fmigneault left a comment

fmigneault Jul 12, 2023

fmigneault Jul 12, 2023

fmigneault Jul 12, 2023

tlvu commented Aug 28, 2023

crim-jenkins-bot commented Aug 28, 2023

crim-jenkins-bot commented Aug 28, 2023

		* birdhouse/docker/geoserver: not used since 3-4 years, replaced by https://github.com/kartoza/docker-geoserver

		* birdhouse/config/geoserver/Dockerfile: was introduced in commit f3b9896e6b771e0aff62c6851c2376d730ddadaf

Remove unused geoserver dockerfiles #353

Remove unused geoserver dockerfiles #353

Conversation

tlvu commented Jul 12, 2023 • edited Loading

crim-jenkins-bot commented Jul 12, 2023

E2E Test Results

DACCS-iac Pipeline Results

PAVICS-e2e-workflow-tests Pipeline Results

fmigneault left a comment

Choose a reason for hiding this comment

fmigneault Jul 12, 2023

Choose a reason for hiding this comment

fmigneault Jul 12, 2023

Choose a reason for hiding this comment

fmigneault Jul 12, 2023

Choose a reason for hiding this comment

tlvu commented Aug 28, 2023

crim-jenkins-bot commented Aug 28, 2023

E2E Test Results

DACCS-iac Pipeline Results

PAVICS-e2e-workflow-tests Pipeline Results

crim-jenkins-bot commented Aug 28, 2023

E2E Test Results

DACCS-iac Pipeline Results

PAVICS-e2e-workflow-tests Pipeline Results

tlvu commented Jul 12, 2023 •

edited

Loading