Merge pull request #740 from caprover/master

RC 1.7.1
caprover · Jul 3, 2020 · d42b708 · d42b708
2 parents 4a3331a + 2032389
commit d42b708
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/dockerfile-captain.release b/dockerfile-captain.release
@@ -15,7 +15,7 @@ RUN npm install --production && \
 
 # Build frontend code using a fixed hash commit. 
 
-ENV FRONTEND_COMMIT_HASH bc82eaf1994daeda17ec54f5bfc4194e8941d584
+ENV FRONTEND_COMMIT_HASH 08960a9da2e7fbdfc04e1ed79890c6fa9ab1d41b
 
 RUN mkdir -p /usr/src/app-frontend && cd /usr/src/app-frontend && \
  git clone https://github.com/githubsaturn/caprover-frontend.git && \

diff --git a/src/user/system/LoadBalancerManager.ts b/src/user/system/LoadBalancerManager.ts
@@ -754,15 +754,15 @@ class LoadBalancerManager {
  return self.certbotManager.init(myNodeId)
  })
  .then(function () {
- // schedule the 1 minute:
+ // schedule the 10sec:
  // Ensure DH Params exists
  // First attempt to renew certs in
  setTimeout(function () {
  self.ensureDhParamFileExists(dataStore) //
  .then(function () {
  return self.renewAllCertsAndReload(dataStore)
  })
- }, 1000 * 60)
+ }, 1000 * 10)
  })
  }
 

diff --git a/src/user/system/SelfHostedDockerRegistry.ts b/src/user/system/SelfHostedDockerRegistry.ts
@@ -65,8 +65,11 @@ class SelfHostedDockerRegistry {
 
  ensureServiceRemoved() {
  const dockerApi = this.dockerApi
-
+ const self = this
  return Promise.resolve() //
+ .then(function () {
+ return self.dataStore.setHasRegistrySsl(false)
+ })
  .then(function () {
  return dockerApi.isServiceRunningByName(
  CaptainConstants.registryServiceName

diff --git a/src/utils/CaptainConstants.ts b/src/utils/CaptainConstants.ts
@@ -17,7 +17,7 @@ const CONSTANT_FILE_OVERRIDE_USER =
 const configs = {
  publishedNameOnDockerHub: 'caprover/caprover',
 
- version: '1.7.0',
+ version: '1.7.1',
 
  defaultMaxLogSize: '512m',