From 595bf89d06ca2d94949b5c0844afb67b22f649dd Mon Sep 17 00:00:00 2001
From: Kasra Bigdeli <kasra85@gmail.com>
Date: Sat, 21 Jan 2023 16:49:57 -0800
Subject: [PATCH] updated to node-18

---
 .github/workflows/build_project.yml   | 10 +++++-----
 .github/workflows/format_project.yml  |  2 +-
 .github/workflows/lint_project.yml    |  2 +-
 .github/workflows/publish_edge.yml    |  2 +-
 .github/workflows/publish_release.yml |  2 +-
 CHANGELOG.md                          |  1 +
 dockerfile-captain.debug              |  2 +-
 dockerfile-captain.edge               |  2 +-
 dockerfile-captain.release            |  2 +-
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build_project.yml b/.github/workflows/build_project.yml
index 2becd18..b5c2964 100644
--- a/.github/workflows/build_project.yml
+++ b/.github/workflows/build_project.yml
@@ -15,9 +15,9 @@ jobs:
             - uses: actions/checkout@v1
             - uses: actions/setup-node@v1
               with:
-                  node-version: 10
+                  node-version: 18
             - run: |
-                sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
-                npm ci 
-                npm run build 
-                npm run test
+                  sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
+                  npm ci 
+                  npm run build 
+                  npm run test
diff --git a/.github/workflows/format_project.yml b/.github/workflows/format_project.yml
index 30d96b9..7d7158c 100644
--- a/.github/workflows/format_project.yml
+++ b/.github/workflows/format_project.yml
@@ -15,5 +15,5 @@ jobs:
             - uses: actions/checkout@v1
             - uses: actions/setup-node@v1
               with:
-                  node-version: 10
+                  node-version: 18
             - run: npm ci && npm run formatter
diff --git a/.github/workflows/lint_project.yml b/.github/workflows/lint_project.yml
index c5aa11f..67c188f 100644
--- a/.github/workflows/lint_project.yml
+++ b/.github/workflows/lint_project.yml
@@ -15,5 +15,5 @@ jobs:
             - uses: actions/checkout@v1
             - uses: actions/setup-node@v1
               with:
-                  node-version: 10
+                  node-version: 18
             - run: npm ci && npm run lint
diff --git a/.github/workflows/publish_edge.yml b/.github/workflows/publish_edge.yml
index 09d4378..5a20f5c 100644
--- a/.github/workflows/publish_edge.yml
+++ b/.github/workflows/publish_edge.yml
@@ -12,7 +12,7 @@ jobs:
             - uses: actions/checkout@v1
             - uses: actions/setup-node@v1
               with:
-                  node-version: 14
+                  node-version: 18
             - run: |
                   sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
                   npm ci
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
index f961c8b..3e52651 100644
--- a/.github/workflows/publish_release.yml
+++ b/.github/workflows/publish_release.yml
@@ -12,7 +12,7 @@ jobs:
             - uses: actions/checkout@v1
             - uses: actions/setup-node@v1
               with:
-                  node-version: 14
+                  node-version: 18
             - run: |
                   sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
                   npm ci
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 736ae1b..309aef9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 -   Improved: Enabling gzip for the dashboard for a faster load
 -   Improved: Allowing custom captain domain for webhooks [PR-1330](https://github.com/caprover/caprover/pull/1330)
 -   Improved: Update Netdata [PR-1432](https://github.com/caprover/caprover/pull/1432)
+-   Improved: Adding support for overwriting app defaults NGINX config [PR-1377](https://github.com/caprover/caprover/pull/1377)
 -   Fixed: Allowing dots to be present in repo names [PR-1553](https://github.com/caprover/caprover/pull/1553)
 
 
diff --git a/dockerfile-captain.debug b/dockerfile-captain.debug
index ec01f2f..ea1a7be 100644
--- a/dockerfile-captain.debug
+++ b/dockerfile-captain.debug
@@ -1,4 +1,4 @@
-FROM node:14
+FROM node:18
 RUN apt-get update && apt-get full-upgrade -yqq && apt-get install build-essential cmake -yqq
 
 RUN apt-get -y install netcat socat
diff --git a/dockerfile-captain.edge b/dockerfile-captain.edge
index b7eb52d..6524106 100644
--- a/dockerfile-captain.edge
+++ b/dockerfile-captain.edge
@@ -1,4 +1,4 @@
-FROM node:14
+FROM node:18
 RUN apt-get update && apt-get full-upgrade -yqq && apt-get install build-essential cmake -yqq
 
 RUN mkdir -p /usr/src/app
diff --git a/dockerfile-captain.release b/dockerfile-captain.release
index 8ddf8e7..c5610e7 100644
--- a/dockerfile-captain.release
+++ b/dockerfile-captain.release
@@ -1,4 +1,4 @@
-FROM node:14
+FROM node:18
 RUN apt-get update && apt-get full-upgrade -yqq && apt-get install build-essential cmake -yqq
 
 RUN mkdir -p /usr/src/app