switch to xray + XTLS + TCP + fallback Nginx

README.md

@@ -8,10 +8,11 @@ Clean, dockerized xray(TCP + XTLS) + Nginx + Let's Encrypt with official and wel
 - Easy multiuser configuration and user conf file generation.
 ## Usage:
 ### Required packages
-- python3.
-- docker-ce.
-- docker-compose.
-- python-jinja2. A popular python template processor. Just search for jinja2 with your distro's package manager.
+- python3: On CentOS 7: `yum install python3`
+- docker-ce
+- docker-compose
+- jinja2: A popular python template processor. Install with `pip3 install jinja2`.
+- pyyaml: Python YAML parser. Install with `pip3 install pyyaml`.
 
 ### Building
 - Clone this repo.
@@ -33,7 +34,7 @@ Currently you need to merge conflict yourself. Most likely only `config.yml` unl
 3. Run `git pull` again
 4. Run `git stash pop` to pop your local changes
 5. Manually merge the conflicting files
-6. Run `git add <merged files>` to mark them as conflict resolved
+6. Run `git add -u` to mark them as conflict resolved
 
 ### Troubleshooting
 #### Basics

docker-compose.in

@@ -35,6 +35,7 @@ services:
                 ports:
                         - 80:80
                 volumes:
+<<<<<<< HEAD
                         - ./nginx:/config
                 healthcheck:
                         test: ["CMD", "curl", "-f", "http://{{ subdomain }}.{{ domain }}:80"]
@@ -45,6 +46,13 @@ services:
         d2ray_xray:
                 container_name: d2ray_xray
                 image: teddysun/xray
+=======
+                        - ./config:/config
+                        - ./nginx/default:/config/nginx/site-confs/default
+        v2ray:
+                container_name: v2ray_v2ray
+                image: teddysun/v2ray
+>>>>>>> 4216d82bcea88adbdd5a309f030f7ef70a2e1116
                 restart: unless-stopped
                 depends_on:
                         d2ray_nginx: