[pull] master from caprover:master

.dockerignore

@@ -7,7 +7,6 @@
 /currentdirectory
 /node_modules
 /built
-/dist-frontend
 /captain-sample-apps
 
 # JetBrains
@@ -17,4 +16,7 @@
 npm-debug.log
 
 
-.DS_Store
+.DS_Store
+
+.github
+.vscode

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,27 +4,22 @@ about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
 **IMPORTANT:** This is a bug report. If you are having problem with deploying a particular app use the deployment issue type.
 
 > If you are having problems with deploying a particular app using a customized dockerfile - please change your questions to Dockerfile and post it where appropriate such as StackOverflow. This is a Docker question, not a CapRover specific issue.
 
---------------------------------------------------------------------------
+---
 
 What is the problem?
 
-
-
 If applicable, content of `captain-definition` file:
 
-
-
 Steps to reproduce the problem:
 
+Output of the following command on your server:
 
-
-Answers to the following questions where applicable:
-- Your OS and version?
-- RAM?
+```
+uname -a && lsb_release -a && free -h
+```

.github/ISSUE_TEMPLATE/deployment-issue.md

@@ -1,30 +1,25 @@
 ---
 name: Deployment Issue
 about: Problem with deploying your apps
-title: "[Deployment Issue]"
+title: '[Deployment Issue]'
 labels: deployment-issue
 assignees: ''
-
 ---
 
 **IMPORTANT:** Please avoid posting issues that are not specific to CapRover. Issues and questions related to Docker will get closed.
 
 > If you are trying to see how to deploy a particular app using a customized dockerfile - please change your questions to Dockerfile and post it where appropriate such as StackOverflow. This is a Docker question, not a CapRover specific issue.
 
---------------------------------------------------------------------------
+---
 
 What is the problem?
 
-
-
 If applicable, content of `captain-definition` file:
 
-
-
 Steps to reproduce the problem:
 
+Output of the following command on your server:
 
-
-Answers to the following questions if applicable:
-- Your OS and version?
-- RAM?
+```
+uname -a && lsb_release -a && free -h
+```

.github/pull_request_template.md

@@ -6,7 +6,7 @@ Please make sure you have read [contribution guidelines](https://github.com/capr
 
 ### Most important items
 
-- Make sure to communicate your proposed changes ob our Slack channel beforehand.
+- Make sure to communicate your proposed changes on our Slack channel beforehand.
 - Large PRs (50+ lines of code) will get rejected due to increased difficulty for review - unless they have been communicated beforehand with project maintainers.
 - **Refactoring work will get rejected** unless it's been communicated with project's maintainers **beforehand**. There is a thousand ways to write the same code. Every time a code is changed, there is a potential for a new bug. We don't want to refactor the code just for the sake of refactoring.
 

.github/workflows/build_project.yml

@@ -1,19 +1,25 @@
 name: Run build
 
 on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+    workflow_dispatch:
+    push:
+        branches:
+            - master
+    pull_request:
+        branches:
+            - master
+            - release
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 10
-      - run: sudo mkdir /captain && npm ci && npm run build && sudo npm run test
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v5
+              with:
+                  node-version: 24
+            - run: |
+                  sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
+                  npm ci 
+                  npm run build 
+                  npm run test

.github/workflows/format_project.yml

@@ -1,19 +1,21 @@
 name: Run formatter
 
 on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+    workflow_dispatch:
+    push:
+        branches:
+            - master
+    pull_request:
+        branches:
+            - master
+            - release
 
 jobs:
-  check-code-formatting:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 10
-      - run: npm ci && npm run formatter
+    check-code-formatting:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v5
+              with:
+                  node-version: 24
+            - run: npm ci && npm run formatter

.github/workflows/lint_project.yml

@@ -1,19 +1,25 @@
 name: Run lint
 
 on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+    workflow_dispatch:
+    push:
+        branches:
+            - master
+    pull_request:
+        branches:
+            - master
+            - release
 
 jobs:
-  run-tslint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 10
-      - run: npm ci && npm run tslint
+    run-lint:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v5
+              with:
+                  node-version: 24
+            - run: |
+                  sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
+                  npm ci
+                  npm run lint
+                  npm run test

.github/workflows/publish_edge.yml

@@ -5,30 +5,64 @@ on:
         branches:
             - master
 
+concurrency:
+    group: edge-publish
+    queue: max
+
+permissions:
+    contents: read
+
 jobs:
     run-pre-checks:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v1
-            - uses: actions/setup-node@v1
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v5
               with:
-                  node-version: 14
+                  node-version: 24
             - run: |
-                  sudo mkdir /captain
+                  sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
                   npm ci
                   npm run build
-                  npm run tslint
+                  npm run lint
                   npm run formatter
-                  sudo npm run test
-    build-publish-docker-hub:
+                  npm run test
+    prepare-frontend:
         needs: run-pre-checks
         runs-on: ubuntu-latest
         steps:
-            - uses: azure/docker-login@v1
+            - uses: actions/checkout@v4
+            - name: Build edge frontend
+              shell: bash
+              run: ./release/build-and-push.sh edge frontend
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: edge-frontend
+                  path: dist-frontend
+                  if-no-files-found: error
+                  retention-days: 1
+    build-publish-docker-hub:
+        needs: prepare-frontend
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/download-artifact@v4
+              with:
+                  name: edge-frontend
+                  path: dist-frontend
+            - name: Prepare multi-platform builder
+              shell: bash
+              run: ./release/build-and-push.sh edge docker-setup
+            - uses: docker/login-action@v3
               with:
                   username: ${{ secrets.REGISTRY_USERNAME }}
                   password: ${{ secrets.REGISTRY_PASSWORD }}
-            - uses: actions/checkout@v1
             - name: Build and Push Edge to DockerHub
               shell: bash
-              run: ./dev-scripts/build_and_push_edge.sh
+              run: ./release/build-and-push.sh edge publish
+            - name: Clean up old edge commit tags
+              shell: bash
+              env:
+                  REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+                  REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
+              run: bash ./release/cleanup-edge-tags.sh

.github/workflows/publish_release.yml

@@ -5,30 +5,84 @@ on:
         branches:
             - release
 
+concurrency:
+    group: production-release
+    queue: max
+
+permissions:
+    contents: read
+
 jobs:
     run-pre-checks:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v1
-            - uses: actions/setup-node@v1
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v5
               with:
-                  node-version: 14
+                  node-version: 24
             - run: |
-                  sudo mkdir /captain
+                  sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
                   npm ci
                   npm run build
-                  npm run tslint
+                  npm run lint
                   npm run formatter
-                  sudo npm run test
-    build-publish-docker-hub:
+                  npm run test
+    prepare-frontend:
         needs: run-pre-checks
         runs-on: ubuntu-latest
         steps:
-            - uses: azure/docker-login@v1
+            - uses: actions/checkout@v4
+            - name: Build release frontend
+              shell: bash
+              run: ./release/build-and-push.sh release frontend
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: release-frontend
+                  path: dist-frontend
+                  if-no-files-found: error
+                  retention-days: 1
+    build-publish-docker-hub:
+        needs: prepare-frontend
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/download-artifact@v4
+              with:
+                  name: release-frontend
+                  path: dist-frontend
+            - name: Prepare multi-platform builder
+              shell: bash
+              run: ./release/build-and-push.sh release docker-setup
+            - uses: docker/login-action@v3
               with:
                   username: ${{ secrets.REGISTRY_USERNAME }}
                   password: ${{ secrets.REGISTRY_PASSWORD }}
-            - uses: actions/checkout@v1
             - name: Build and Push Release to DockerHub
               shell: bash
-              run: ./dev-scripts/build_and_push_release.sh
+              run: ./release/build-and-push.sh release publish
+    draft-github-release:
+        needs: build-publish-docker-hub
+        permissions:
+            contents: write
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - name: Create draft GitHub release
+              env:
+                  GH_TOKEN: ${{ github.token }}
+              shell: bash
+              run: ./release/create-draft-release.sh
+    backmerge-release:
+        needs: draft-github-release
+        permissions:
+            actions: write
+            contents: write
+            pull-requests: write
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - name: Open release backmerge PR
+              env:
+                  GH_TOKEN: ${{ github.token }}
+              shell: bash
+              run: ./release/create-backmerge-pr.sh