lee/caprover
1
0
Fork 0
mirror of https://github.com/caprover/caprover synced 2025-12-12 06:15:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Testing again. Minimal changes to start.

Browse Source
This commit is contained in:
raisercostin
2024-12-28 01:33:24 +02:00
parent 886cbbf111
commit b59cd2bf69
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dev-scripts/dev-clean-run-as-dev.sh
View File

@@ -11,15 +11,15 @@ sleep 1s
docker secret rm captain-salt docker secret rm captain-salt
docker build -t captain-debug -f dockerfile-captain.debug . docker build -t captain-debug -f dockerfile-captain.debug .
rm -rf /captain && mkdir /captain rm -rf /captain && mkdir /captain
mkdir -p /captain/data/shared-logs
chmod -R 777 /captain chmod -R 777 /captain
# Add to run on differnt ports
# -e "CAPTAIN_HOST_HTTP_PORT=10080" \
# -e "CAPTAIN_HOST_HTTPS_PORT=10443" \
# -e "CAPTAIN_HOST_ADMIN_PORT=13000" \
docker run \ docker run \
-e "CAPTAIN_IS_DEBUG=1" \ -e "CAPTAIN_IS_DEBUG=1" \
-e "MAIN_NODE_IP_ADDRESS=127.0.0.1" \ -e "MAIN_NODE_IP_ADDRESS=127.0.0.1" \
-e "CAPTAIN_HOST_HTTP_PORT=10083" \
-e "CAPTAIN_HOST_HTTPS_PORT=10443" \
-e "CAPTAIN_HOST_ADMIN_PORT=13000" \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
-v /captain:/captain \ -v /captain:/captain \
-v $(pwd):/usr/src/app captain-debug -v $(pwd):/usr/src/app captain-debug

11
src/datastore/DataStore.ts
View File

@@ -4,8 +4,8 @@
import Configstore = require('configstore') import Configstore = require('configstore')
import fs = require('fs-extra') import fs = require('fs-extra')
import { import {
AutomatedCleanupConfigsCleaner, AutomatedCleanupConfigsCleaner,
IAutomatedCleanupConfigs, IAutomatedCleanupConfigs,
} from '../models/AutomatedCleanupConfigs' } from '../models/AutomatedCleanupConfigs'
import CapRoverTheme from '../models/CapRoverTheme' import CapRoverTheme from '../models/CapRoverTheme'
import { GoAccessInfo } from '../models/GoAccessInfo' import { GoAccessInfo } from '../models/GoAccessInfo'
@@ -249,8 +249,11 @@ class DataStore {
const goAccessInfo = (self.data.get(GOACCESS_INFO) || const goAccessInfo = (self.data.get(GOACCESS_INFO) ||
{}) as GoAccessInfo {}) as GoAccessInfo
goAccessInfo.isEnabled = goAccessInfo.isEnabled || false goAccessInfo.isEnabled = goAccessInfo.isEnabled || false
goAccessInfo.data.rotationFrequencyCron = if(!goAccessInfo.data) {
goAccessInfo.data.rotationFrequencyCron ?? '0 0 1 * *' // monthly goAccessInfo.data = {
rotationFrequencyCron:'0 0 1 * *' // monthly
}
}
return Promise.resolve(goAccessInfo) return Promise.resolve(goAccessInfo)
} }

2
src/utils/CaptainConstants.ts
View File

@@ -247,7 +247,7 @@ if (data.isDebug) {
data.debugSourceDirectory = devDirectoryOnLocalMachine data.debugSourceDirectory = devDirectoryOnLocalMachine
data.configs.publishedNameOnDockerHub = 'captain-debug' data.configs.publishedNameOnDockerHub = 'captain-debug'
data.configs.nginxPortNumber80 = 80 // data.configs.nginxPortNumber80 = 80
} }
export default data export default data