Merge branch 'main' into feature/websockets

TACC-Cloud · Dec 11, 2024 · 0d783d6 · 0d783d6
2 parents d689533 + 302a04e
commit 0d783d6
Show file tree

Hide file tree

Showing 18 changed files with 242 additions and 364 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,26 @@
 # Changelog
 
-## [Unreleased]
+## [2.19] - 2024-12-05
+
+### Changed
+
+- WG-295, WG-179,WG-185: Improve projects with duplicate system path constraints (#216)
+- WG-161: Remove Kube doc/devops files (#183)
+- WG-383: Add queue for heavy tasks (#220)
+- WG-285: Update potree converter (#218)
+- Improve database initialization (#217)
+
+
+## [2.18] - 2024-08-07
+
+### Changed
+
+- Add support for Tapis V3 (#177, #179, #180, #181, #193, #198, #199, #202, #206, #207, #208)
+
+### Added
+
+- Add nginx conf for hazmapper.tacc.utexas.edu (#192)
+- WG-270: use certs on geoapi-services (#188)
 
 ## [2.17] - 2024-4-29
 
@@ -14,7 +34,7 @@
 
 ### Fixed
 
-- fix watchtower (#184)
+- Fix watchtower (#184)
 
 ## [2.16] - 2023-12-19
 
@@ -197,7 +217,9 @@
 - DES-1687: Add rollingback to worker tasks (#30)
 - DES-1663: Fix image rotations (#36)
 
-[unreleased]: https://github.com/TACC-Cloud/geoapi/compare/v2.17...HEAD
+[unreleased]: https://github.com/TACC-Cloud/geoapi/compare/v2.19...HEAD
+[2.19]: https://github.com/TACC-Cloud/geoapi/releases/tag/v2.19
+[2.18]: https://github.com/TACC-Cloud/geoapi/releases/tag/v2.18
 [2.17]: https://github.com/TACC-Cloud/geoapi/releases/tag/v2.17
 [2.16]: https://github.com/TACC-Cloud/geoapi/releases/tag/v2.16
 [2.15]: https://github.com/TACC-Cloud/geoapi/releases/tag/v2.15

diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ docker exec -it geoapi /bin/bash
 # determine a description for the migration like 'add_user_email_column'
 alembic revision --autogenerate -m "add_user_email_column"
 # Then:
-# - remove drop table commands for postgis
+# - check to make sure no postgis table commands (we try to ommit them in env.py)
 # - add/commit migrations
 ```
 

diff --git a/devops/README.md b/devops/README.md
@@ -18,8 +18,8 @@ Deployment configuration including the tag of which image is deployed is maintai
 ## Configuration
 
 The configurations for each of the following are in their associated directories:
-* [geoapi-services](geoapi-services/) - Main backend services
-* [geoapi-workers](geoapi-workers/) - Workers
+* geoapi-services - Main backend services (deployed by Camino, see [here](https://github.com/TACC/Core-Portal-Deployments/tree/main/geoapi-workers/camino))
+* geoapi-workers - Workers (deployed by Camino, see [here](https://github.com/TACC/Core-Portal-Deployments/tree/main/geoapi-services/camino))
 * [database](database/) - geoapi-database
 * [hazmapper](hazmapper/) - hazmapper.tacc.utexas.edu
 * nfs-geoapi - TODO: See https://tacc-main.atlassian.net/browse/WG-226

diff --git a/devops/geoapi-services/Makefile b/devops/geoapi-services/Makefile
diff --git a/devops/geoapi-services/README.md b/devops/geoapi-services/README.md
@@ -0,0 +1 @@
+See https://github.com/TACC/Core-Portal-Deployments/tree/main/geoapi-services/camino
diff --git a/devops/geoapi-services/docker-compose.yml b/devops/geoapi-services/docker-compose.yml
diff --git a/devops/geoapi-services/nginx.conf b/devops/geoapi-services/nginx.conf
diff --git a/devops/geoapi-services/secrets.sample.env b/devops/geoapi-services/secrets.sample.env
diff --git a/devops/geoapi-workers/Makefile b/devops/geoapi-workers/Makefile
diff --git a/devops/geoapi-workers/README.md b/devops/geoapi-workers/README.md
@@ -0,0 +1 @@
+See https://github.com/TACC/Core-Portal-Deployments/tree/main/geoapi-workers/camino
diff --git a/devops/geoapi-workers/docker-compose.yml b/devops/geoapi-workers/docker-compose.yml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		See https://github.com/TACC/Core-Portal-Deployments/tree/main/geoapi-services/camino