issue/hitide-profile-72: fix merge conflicts with release/4.10.1

podaac · Aug 12, 2024 · 0c1674b · 0c1674b
2 parents 085ab93 + ae34175
commit 0c1674b
Show file tree

Hide file tree

Showing 6 changed files with 3,330 additions and 11,893 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,11 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 ### Changed
-- issue-58: Changed harmony submit call from GET to POST.
 ### Removed
 ### Fixed
 - issue-72: Fixed multipart form data for harmony submit.
+- issue-45: Fixed history not showing up.
+
 
+## [4.10.1]
+### Added
+### Changed
+- issue-58: Changed harmony submit call from GET to POST.
+- feature-29: updated docker node version to 20.12.1 (the most current long term support version).
+### Removed
+### Fixed
 
 ## [4.10.0]
 ### Added
@@ -22,7 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [4.9.8]
 ### Added
-- Update github actions to have commit message trigger deploys
+- Update github actions to have commit message trigger deploys.
 - PODAAC-5326: Fixed 'Add matching granules to download' button.
 ### Changed
 ### Removed

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10
+FROM node:20.12.1
 LABEL org.opencontainers.image.source="https://github.com/podaac/hitide-profile"
 RUN npm install forever -g