CrazyAdmin · July 23, 2019 09:59 · Jun 13, 2018 · Jun 13, 2018 · May 14, 2018 · May 14, 2018
diff --git a/docker + nginx + nodejs + pm2 + mongo.txt b/docker + nginx + nodejs + pm2 + mongo.txt
@@ -50,9 +50,10 @@ services:
 # нужно изменить внешний (первый) порт на открытый например(1337)
 # нужно изменить внутренний (второй) порт на 443 если SSL
     ports:
-    - "1337:443"
+    - "80:80"
+    - "443:443"
   api:
-    image: node:latest
+    image: node:10
     restart: always
     volumes:
     - ./myapp:/usr/app

diff --git a/docker + nginx + nodejs + pm2 + mongo.txt b/docker + nginx + nodejs + pm2 + mongo.txt
@@ -1,24 +1,39 @@
 # NGINX CONFIG
 server {
-#нжинкс слушает порты и прокисрует на докер контейнер
-      listen 80 default_server;
-      listen [::]:80 default_server;
-      return 301 https://$host$request_uri;
+  listen 80 default_server;
+  listen [::]:80 default_server;
+
+  return 301 https://$host$request_uri;
 }
 server {
-      listen 443 ssl default_server;
-      listen [::]:443 ssl default_server;
-      ssl on;
-      ssl_certificate ssl/example.com.crt;
-      ssl_certificate_key ssl/example.com.key;
-      server_name example.com;
-
-      root /var/www/example.com;
-      index index.html;
-
-      location / {
-              proxy_pass http://api:8081;
-      }
+  listen 443 ssl default_server;
+  listen [::]:443 ssl default_server;
+
+  ssl on;
+  ssl_certificate ssl/fullchain.pem;
+  ssl_certificate_key ssl/privkey.pem;
+
+
+  root /var/www/example.com;
+  index index.html;
+  server_name www.sunlive.pro sunlive.pro;
+
+  location / {
+        proxy_pass http://app:3000;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_redirect off;
+
+        proxy_buffers 8 32k;
+        proxy_buffer_size 64k;
+
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-NginX-Proxy true;
+  }
+
 }
 
 # Docker-compose.yml

diff --git a/docker + nginx + nodejs + pm2.txt → docker + nginx + nodejs + pm2 + mongo.txt b/docker + nginx + nodejs + pm2.txt → docker + nginx + nodejs + pm2 + mongo.txt
@@ -42,6 +42,16 @@ services:
     volumes:
     - ./myapp:/usr/app
     command: /bin/bash -c "cd /usr/app && npm i -g pm2 && npm i && npm start"
+  mongoDB:
+    image: mongo
+    restart: always
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: example
+      MONGO_INITDB_DATABASE: testdb
+    ports:
+    - "3001:27017"
+
 
 ##### pm2 #####
 #process.yml
@@ -58,6 +68,7 @@ apps:
 }
 
 
+
 #stop all containers:
 docker kill $(docker ps -q)
 

diff --git a/gistfile1.txt → docker + nginx + nodejs + pm2.txt b/gistfile1.txt → docker + nginx + nodejs + pm2.txt
diff --git a/gistfile1.txt b/gistfile1.txt
@@ -27,7 +27,7 @@ version: '3.2'
 services:
   web:
     image: nginx
-    restart: on-failure
+    restart: always
     volumes:
 # default.conf
     - ./config:/etc/nginx/conf.d
@@ -38,6 +38,7 @@ services:
     - "1337:443"
   api:
     image: node:latest
+    restart: always
     volumes:
     - ./myapp:/usr/app
     command: /bin/bash -c "cd /usr/app && npm i -g pm2 && npm i && npm start"

diff --git a/gistfile1.txt b/gistfile1.txt
@@ -17,7 +17,7 @@ server {
       index index.html;
 
       location / {
-              proxy_pass http://api:3000;
+              proxy_pass http://api:8081;
       }
 }
 
@@ -40,7 +40,21 @@ services:
     image: node:latest
     volumes:
     - ./myapp:/usr/app
-    command: /bin/bash -c "cd /usr/app && npm i && npm start"
+    command: /bin/bash -c "cd /usr/app && npm i -g pm2 && npm i && npm start"
+
+##### pm2 #####
+#process.yml
+apps:
+  - script   : './src/index.js'
+    name     : 'API'
+    exec_mode: 'cluster'
+    instances: 1
+    watch: true (?)
+
+#package.json
+"scripts": {
+      "start": "pm2-runtime process.yml"
+}
 
 
 #stop all containers:

diff --git a/gistfile1.txt b/gistfile1.txt
@@ -29,6 +29,7 @@ services:
     image: nginx
     restart: on-failure
     volumes:
+# default.conf
     - ./config:/etc/nginx/conf.d
     - ./ssl:/etc/nginx/ssl
 # нужно изменить внешний (первый) порт на открытый например(1337)

diff --git a/gistfile1.txt b/gistfile1.txt
@@ -1,7 +1,6 @@
 # NGINX CONFIG
 server {
-#nginx слушает внутренний порт локальной машины
-#можно тут любой свободный хуярить
+#нжинкс слушает порты и прокисрует на докер контейнер
       listen 80 default_server;
       listen [::]:80 default_server;
       return 301 https://$host$request_uri;

diff --git a/gistfile1.txt b/gistfile1.txt
@@ -1,5 +1,7 @@
 # NGINX CONFIG
 server {
+#nginx слушает внутренний порт локальной машины
+#можно тут любой свободный хуярить
       listen 80 default_server;
       listen [::]:80 default_server;
       return 301 https://$host$request_uri;
@@ -30,10 +32,10 @@ services:
     volumes:
     - ./config:/etc/nginx/conf.d
     - ./ssl:/etc/nginx/ssl
-# нужно изменить внешний (первый) порт на открытый
+# нужно изменить внешний (первый) порт на открытый например(1337)
 # нужно изменить внутренний (второй) порт на 443 если SSL
     ports:
-    - "80:80"
+    - "1337:443"
   api:
     image: node:latest
     volumes:

diff --git a/gistfile1.txt b/gistfile1.txt
@@ -55,3 +55,4 @@ docker rmi $(docker images -q)
 https://letsencrypt.org/docs/certificates-for-localhost/
 #ssl for domain
 https://www.digitalocean.com/community/tutorials/how-to-secure-nginx-with-let-s-encrypt-on-ubuntu-16-04
+https://oxozle.com/2018/01/21/nastrojka-ssl-let-s-encrypt-v-nginx-na-ubuntu
diff --git a/gistfile1.txt b/gistfile1.txt
@@ -40,6 +40,16 @@ services:
     - ./myapp:/usr/app
     command: /bin/bash -c "cd /usr/app && npm i && npm start"
 
+
+#stop all containers:
+docker kill $(docker ps -q)
+
+#remove all containers
+docker rm $(docker ps -a -q)
+
+#remove all docker images
+docker rmi $(docker images -q)
+
 #ssl
 #ssl for localhost
 https://letsencrypt.org/docs/certificates-for-localhost/

diff --git a/gistfile1.txt b/gistfile1.txt
@@ -30,7 +30,8 @@ services:
     volumes:
     - ./config:/etc/nginx/conf.d
     - ./ssl:/etc/nginx/ssl
-# тут нужно изменить внешний порт на открытый
+# нужно изменить внешний (первый) порт на открытый
+# нужно изменить внутренний (второй) порт на 443 если SSL
     ports:
     - "80:80"
   api:

diff --git a/gistfile1.txt b/gistfile1.txt
@@ -30,6 +30,7 @@ services:
     volumes:
     - ./config:/etc/nginx/conf.d
     - ./ssl:/etc/nginx/ssl
+# тут нужно изменить внешний порт на открытый
     ports:
     - "80:80"
   api:

diff --git a/gistfile1.txt b/gistfile1.txt
@@ -2,6 +2,7 @@
 server {
       listen 80 default_server;
       listen [::]:80 default_server;
+      return 301 https://$host$request_uri;
 }
 server {
       listen 443 ssl default_server;

diff --git a/gistfile1.txt b/gistfile1.txt
@@ -2,7 +2,13 @@
 server {
       listen 80 default_server;
       listen [::]:80 default_server;
-
+}
+server {
+      listen 443 ssl default_server;
+      listen [::]:443 ssl default_server;
+      ssl on;
+      ssl_certificate ssl/example.com.crt;
+      ssl_certificate_key ssl/example.com.key;
       server_name example.com;
 
       root /var/www/example.com;
@@ -22,6 +28,7 @@ services:
     restart: on-failure
     volumes:
     - ./config:/etc/nginx/conf.d
+    - ./ssl:/etc/nginx/ssl
     ports:
     - "80:80"
   api:

diff --git a/gistfile1.txt b/gistfile1.txt
@@ -28,4 +28,10 @@ services:
     image: node:latest
     volumes:
     - ./myapp:/usr/app
-    command: /bin/bash -c "cd /usr/app && npm i && npm start"
+    command: /bin/bash -c "cd /usr/app && npm i && npm start"
+
+#ssl
+#ssl for localhost
+https://letsencrypt.org/docs/certificates-for-localhost/
+#ssl for domain
+https://www.digitalocean.com/community/tutorials/how-to-secure-nginx-with-let-s-encrypt-on-ubuntu-16-04
diff --git a/gistfile1.txt b/gistfile1.txt
@@ -0,0 +1,31 @@
+# NGINX CONFIG
+server {
+      listen 80 default_server;
+      listen [::]:80 default_server;
+
+      server_name example.com;
+
+      root /var/www/example.com;
+      index index.html;
+
+      location / {
+              proxy_pass http://api:3000;
+      }
+}
+
+# Docker-compose.yml
+version: '3.2'
+
+services:
+  web:
+    image: nginx
+    restart: on-failure
+    volumes:
+    - ./config:/etc/nginx/conf.d
+    ports:
+    - "80:80"
+  api:
+    image: node:latest
+    volumes:
+    - ./myapp:/usr/app
+    command: /bin/bash -c "cd /usr/app && npm i && npm start"