Merge pull request #885 from caprover/master

Release 1.8.1

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 - TBD
 
+## [1.8.1] - 2020-10-31
+
+- New: CapRover now supports ARM processors [issue-445](https://github.com/caprover/caprover/issues/445)
+- Fixed: Logout did not clear cookies. [issue-810](https://github.com/caprover/caprover/issues/810)
+- Fixed: Creating a new app while another app is building breaks the UI [Issue-56](https://github.com/caprover/caprover-frontend/issues/56)
+
 ## [1.8.0] - 2020-08-16
 
 - New: Update Docker API to v1.40 - Make sure to have Docker v19.03 or above. [Issue-797](https://github.com/caprover/caprover/issues/797)

README.md

@@ -2,7 +2,7 @@
 
 #### Easiest app/database deployment platform and webserver package for your NodeJS, Python, PHP, Ruby, Go applications. No Docker, nginx knowledge required!   [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?url=https%3A%2F%2Fgithub.com%2Fcaprover%2Fcaprover&via=cap_rover&text=I%20found%20the%20easiest%20webserver%20package%20for%20NodeJS%2C%20PHP%2C%20MySQL%2C%20WordPress%20and%20everything%21&hashtags=CapRover%2Cnodejs%2Cdocker%2Cnginx%2Cwebdev)
 
-[![YouTube](https://raw.githubusercontent.com/caprover/caprover-website/master/graphics/screenshots-video-small.gif)](https://www.youtube.com/watch?v=XDrTmGSDW3s)
+[![YouTube](https://raw.githubusercontent.com/caprover/caprover-website/master/graphics/screenshots-video-small.gif)](https://youtu.be/VPHEXPfsvyQ)
 
 ### Seriously! Who should care about CapRover?
 - A [web] developer who does not like spending hours and days setting up a server, build tools, sending code to server, build it, get an SSL certificate, install it, update nginx over and over again.

dev-scripts/build_and_push_edge.sh

@@ -8,6 +8,16 @@ set -x
 
 pwd
 
+# ensure you're not running it on local machine
+if [ -z "$CI" ] || [ -z "$GITHUB_REF" ]; then
+ echo "Running on a local machine! Exiting!"
+ exit 127
+else
+ echo "Running on CI"
+fi
+
+docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+
 CAPROVER_VERSION=0.0.1
 IMAGE_NAME=caprover/caprover-edge
 
@@ -30,11 +40,9 @@ fi
 
 
 
+export DOCKER_CLI_EXPERIMENTAL=enabled
+docker buildx ls
+docker buildx create --name mybuilder
+docker buildx use mybuilder
 
-
-
-
-
-docker build -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest -f dockerfile-captain.edge .
-docker push $IMAGE_NAME:$CAPROVER_VERSION
-docker push $IMAGE_NAME:latest
+docker buildx build --platform linux/amd64,linux/arm64,linux/arm -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest -f dockerfile-captain.edge --push .

dev-scripts/build_and_push_release.sh

@@ -8,6 +8,16 @@ set -x
 
 pwd
 
+# ensure you're not running it on local machine
+if [ -z "$CI" ] || [ -z "$GITHUB_REF" ]; then
+ echo "Running on a local machine! Exiting!"
+ exit 127
+else
+ echo "Running on CI"
+fi
+
+docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+
 
 IMAGE_NAME=caprover/caprover
 
@@ -35,6 +45,9 @@ node ./dev-scripts/validate-build-version-docker-hub.js
 
 source ./version
 
-docker build -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest -f dockerfile-captain.release .
-docker push $IMAGE_NAME:$CAPROVER_VERSION
-docker push $IMAGE_NAME:latest
+export DOCKER_CLI_EXPERIMENTAL=enabled
+docker buildx ls
+docker buildx create --name mybuilder
+docker buildx use mybuilder
+
+docker buildx build --platform linux/amd64,linux/arm64,linux/arm -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest -f dockerfile-captain.release --push .

dev-scripts/digitalocean-oneclick-app-generator

@@ -9,7 +9,7 @@ apt -y update && apt -y full-upgrade
 ############################ WAIT
 
 
-docker pull caprover/caprover:1.7.1
+docker pull caprover/caprover:1.8.0
 
 
 cd /var/lib/cloud/scripts/per-instance
@@ -23,7 +23,7 @@ cat <<EOT >> z_01_caprover_installation.sh
 
 ufw allow 80,443,3000,996,7946,4789,2377/tcp; ufw allow 7946,4789,2377/udp;
 
-docker run -p 80:80 -p 443:443 -p 3000:3000 -v /var/run/docker.sock:/var/run/docker.sock -v /captain:/captain caprover/caprover:1.7.1
+docker run -p 80:80 -p 443:443 -p 3000:3000 -v /var/run/docker.sock:/var/run/docker.sock -v /captain:/captain caprover/caprover:1.8.0
 
 
 EOT

dockerfile-captain.edge

@@ -7,6 +7,7 @@ RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
 
+
 # Build backend code
 
 COPY . /usr/src/app

src/datastore/AppsDataStore.ts

@@ -742,7 +742,7 @@ class AppsDataStore {
 
  appObj.envVars.push({
  key: obj.key,
- value: obj.value,
+ value: `${obj.value}`,
  })
  }
  }

src/user/system/LoadBalancerManager.ts

@@ -788,6 +788,9 @@ class LoadBalancerManager {
  .then(function () {
  return self.renewAllCertsAndReload(dataStore)
  })
+ .catch((err) => {
+ Logger.e(err)
+ })
  }, 1000 * 10)
  })
  }
@@ -800,7 +803,10 @@ class LoadBalancerManager {
  // the day in case if that's our super high traffic time
 
  setTimeout(function () {
- self.renewAllCertsAndReload(dataStore)
+ self.renewAllCertsAndReload(dataStore) //
+ .catch((err) => {
+ Logger.e(err)
+ })
  }, 1000 * 3600 * 20.3)
 
  return self.certbotManager

src/utils/CaptainConstants.ts

@@ -17,7 +17,7 @@ const CONSTANT_FILE_OVERRIDE_USER =
 const configs = {
  publishedNameOnDockerHub: 'caprover/caprover',
 
- version: '1.8.0',
+ version: '1.8.1',
 
  defaultMaxLogSize: '512m',
 
@@ -35,7 +35,7 @@ const configs = {
 
  dockerApiVersion: 'v1.40',
 
- netDataImageName: 'titpetric/netdata:1.8',
+ netDataImageName: 'caprover/netdata:v1.8.0',
 
  registryImageName: 'registry:2',
 
@@ -123,7 +123,7 @@ let data = {
 
  // ********************* Local Docker Constants ************************
 
- certbotImageName: 'caprover/certbot-sleeping:v1.5.0',
+ certbotImageName: 'caprover/certbot-sleeping:v1.6.0',
 
  captainSaltSecretKey: 'captain-salt',
 

src/utils/GitHelper.ts

@@ -130,7 +130,7 @@ export default class GitHelper {
  input = `${split[0]}:22/${split[1]}`
  }
  } else {
- throw new Error(`Marformatted SSH path: ${input}`)
+ throw new Error(`Malformatted SSH path: ${input}`)
  }
 
  if (!input.toLowerCase().startsWith('ssh://')) {