Merge pull request #1218 from caprover/master

Release 1.10.1

.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
+```

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 - TBD
 
+## [1.10.1] - 2021-10-09
+
+- Fixed: Fixed expired SSL certs issue [Issue-1215](https://github.com/caprover/caprover/issues/1215)
+- Fixed: On some VMs the initial installation used to fail due to issues with Docker's ingress network. [Issue-1206](https://github.com/caprover/caprover/issues/1206)
+- Fixed: CAPROVER_GIT_COMMIT_SHA wasn't available if deployed using webhook [Issue-1198](https://github.com/caprover/caprover/issues/1198)
+
 ## [1.10.0] - 2021-08-31
 
 - Fixed: Editing a docker remote registry does not trigger an authentication check [Issue-1027](https://github.com/caprover/caprover/issues/1027)

README.md

@@ -42,7 +42,7 @@ It's blazingly fast and very robust as it uses Docker, nginx, LetsEncrypt and Ne
 ### 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.
-- A developer who uses expensive services like Heroku, Microsoft Azure and etc. And is interested in reducing their cost by 4x (Heroku charges 25$/month for their 1gb instance, the same server is 5$ on vultr!!)
+- A developer who uses expensive services like Heroku, Microsoft Azure and etc. And is interested in reducing their cost by 50x (Heroku charges 250$/month for their 2gb instance, the same server is 5$ on Hetzner!!)
 - Someone who prefers to write more of `showResults(getUserList())` and not much of `$ apt-get install libstdc++6 > /dev/null`
 - A developer who likes installing MySQL, MongoDB and etc on their server by selecting from a dropdown and clicking on install!
 - How much server/docker/linux knowledge is required to set up a CapRover server? Answer: Knowledge of Copy & Paste!! Head over to "Getting Started" for information on what to copy & paste ;-)

dev-scripts/digitalocean-oneclick-app-generator

@@ -9,7 +9,7 @@ apt -y update && apt -y full-upgrade && apt autoclean -y && apt autoremove -y
 ############################ WAIT
 
 
-docker pull caprover/caprover:1.9.0
+docker pull caprover/caprover:1.10.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.9.0
+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.10.0
 
 
 EOT
@@ -80,19 +80,19 @@ apt -y update && apt -y full-upgrade
 
 
 cd /etc
-wget https://raw.githubusercontent.com/digitalocean/marketplace-partners/master/scripts/cleanup.sh
-chmod +x cleanup.sh
-./cleanup.sh
+wget https://raw.githubusercontent.com/digitalocean/marketplace-partners/master/scripts/99-img-check.sh
+chmod +x 99-img-check.sh
+./99-img-check.sh
 
 
 ############################ WAIT
 
 
 
 cd /etc
-wget https://raw.githubusercontent.com/digitalocean/marketplace-partners/master/scripts/img_check.sh
-chmod +x img_check.sh
-./img_check.sh
+wget https://raw.githubusercontent.com/digitalocean/marketplace-partners/master/scripts/90-cleanup.sh
+chmod +x 90-cleanup.sh
+./90-cleanup.sh
 
 
 

dockerfile-captain.edge

@@ -17,7 +17,7 @@ RUN npm ci && \
 
 # Build frontend code
 
- # This quick hack invalidates the cache
+ # This quick hack invalidates the cache.
 ADD https://www.google.com /time.now
 
 # armV7 fails: https://github.com/yarnpkg/yarn/issues/5259 https://github.com/nodejs/docker-node/issues/1335
@@ -36,4 +36,4 @@ ENV NODE_ENV production
 ENV PORT 3000
 EXPOSE 3000
 
-CMD ["npm" , "start"]
+CMD ["node" , "./built/server.js"]

dockerfile-captain.release

@@ -36,4 +36,4 @@ ENV NODE_ENV production
 ENV PORT 3000
 EXPOSE 3000
 
-CMD ["npm" , "start"]
+CMD ["node" , "./built/server.js"]