Merge branch 'master' of git.quacker.org:d/d2ray

quackerd · Aug 21, 2023 · 63e83e3 · 63e83e3
2 parents 935fdce + e4c95c2
commit 63e83e3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -21,4 +21,6 @@ COPY ./opt /opt/
 
 # remove packages
 RUN set -xe && apk del unzip wget
+
+VOLUME /etc/d2ray
 CMD ["sh", "/opt/init.sh"]
diff --git a/README.md b/README.md
@@ -23,9 +23,12 @@ d2ray checks whether a key file exists at path `/etc/xray/certs/keys` and genera
 
 You can either supply a pre-generated private key using `xray x25519` or let d2ray generate one. The corresponding public key is printed to the container log (`docker logs`), which clients use to connect. 
 
-If you are generating the private key yourself, the key file must contain exactly the output of `xray x25519`.
+If you are generating the keys yourself, the key file must contain exactly the output of `xray x25519`.
 
 ## How To Update?
 - `docker compose down`
 - `docker compose pull`
-- `docker compose up -d`
+- `docker compose up -d`
+
+## Notes
+- The old xtls-vision + TLS + Nginx fallback has been branched out to the `vision` branch.