Merge pull request #2952 from hollaex/beta

Beta

.dockerignore

@@ -3,4 +3,20 @@ settings
 web
 .drone.yml
 install.sh
-uninstall.sh
+uninstall.sh
+
+server/tools
+!server/tools/dbs/*.js
+!server/tools/general/*.js
+!server/tools/nexe
+Dockerfile
+server/docker-compose*
+server/index.html
+server/package-lock.json
+server/logs
+server/coverage
+server/.nyc_output
+server/.*docker-compose.yaml
+server/.drone*.yml
+server/hollaex-kit.env
+server/hollaex-kit.env*

.gitignore

@@ -33,6 +33,8 @@ build
 # surge
 web/CNAME
 server/tools/hollaex-kit.env.local
+server/tools/nginx-dev/logs/*
+nginx/logs/*
 
 # misc
 web/.DS_Store
@@ -64,7 +66,4 @@ templates/kubernetes/config/*
 .DS_Store
 
 .token
-backups
-
-settings
-settings/*
+backups

Dockerfile

@@ -24,8 +24,6 @@ RUN npm install --loglevel=error && \
     pm2 update && \
     cd /app/mail && npm install --loglevel=error
 
-EXPOSE 10010
-
-EXPOSE 10080
+EXPOSE 10010 10080 10011
 
 ENTRYPOINT ["/entrypoint.sh"]