Add support for docker-compose v2 and private keys

README.md

@@ -20,12 +20,68 @@ $ docker run -ti --link something --volume /path/to/keys:/var/lib/tor/hidden_ser
 
 Look at the `docker-compose.yml` file to see how to use it.
 
+## Setup
+
+### Set private key
+
+Private key is settable by environment or by copying file in `hostname/private_key` in docket volume (`hostname` is the link name).
+
+It's easier to pass key in environment with `docker-compose`.
+
+```yaml
+    links:
+      - hello
+      - world
+    environment:
+        # Set private key
+        HELLO_KEY: |
+            -----BEGIN RSA PRIVATE KEY-----
+            MIICXQIBAAKBgQDR8TdQF9fDlGhy1SMgfhMBi9TaFeD12/FK27TZE/tYGhxXvs1C
+            NmFJy1hjVxspF5unmUsCk0yEsvEdcAdp17Vynz6W41VdinETU9yXHlUJ6NyI32AH
+            dnFnHEcsllSEqD1hPAAvMUWwSMJaNmBEFtl8DUMS9tPX5fWGX4w5Xx8dZwIDAQAB
+            AoGBAMb20jMHxaZHWg2qTRYYJa8LdHgS0BZxkWYefnBUbZn7dOz7mM+tddpX6raK
+            8OSqyQu3Tc1tB9GjPLtnVr9KfVwhUVM7YXC/wOZo+u72bv9+4OMrEK/R8xy30XWj
+            GePXEu95yArE4NucYphxBLWMMu2E4RodjyJpczsl0Lohcn4BAkEA+XPaEKnNA3AL
+            1DXRpSpaa0ukGUY/zM7HNUFMW3UP00nxNCpWLSBmrQ56Suy7iSy91oa6HWkDD/4C
+            k0HslnMW5wJBANdz4ehByMJZmJu/b5y8wnFSqep2jmJ1InMvd18BfVoBTQJwGMAr
+            +qwSwNXXK2YYl9VJmCPCfgN0o7h1AEzvdYECQAM5UxUqDKNBvHVmqKn4zShb1ugY
+            t1RfS8XNbT41WhoB96MT9P8qTwlniX8UZiwUrvNp1Ffy9n4raz8Z+APNwvsCQQC9
+            AuaOsReEmMFu8VTjNh2G+TQjgvqKmaQtVNjuOgpUKYv7tYehH3P7/T+62dcy7CRX
+            cwbLaFbQhUUUD2DCHdkBAkB6CbB+qhu67oE4nnBCXllI9EXktXgFyXv/cScNvM9Y
+            FDzzNAAfVc5Nmbmx28Nw+0w6pnpe/3m0Tudbq3nHdHfQ
+            -----END RSA PRIVATE KEY-----
+
+```
+
+Options are set using the following pattern: `LINKNAME_KEY`
+
 ### Setup port
 
+__DEPECATED:__
 By default, ports are the same as linked containers, but a default port can be mapped using `PORT_MAP` environment variable.
 
 __Caution__: Using `PORT_MAP` with multiple ports on single service will cause `tor` to fail.
 
+Use link setting in environment with the following pattern: `LINKNAME_PORTS`.
+
+Like docker, first port is exposed port and the second one is service internal port.
+
+```yaml
+links:
+  - hello
+  - world
+environment:
+    # Set mapping ports
+    HELLO_PORTS: 80:80
+
+    WORLD_PORTS: 8000:80
+
+```
+
+### Compose v2 support
+
+Links setting are required when using docker-compose v2. See `docker-compose.v2.yml` for example.
+
 ### Tools
 
 A command line tool `onions` is available in container to get `.onion` url when container is running.