Permalink
Browse files

Update README.md

  • Loading branch information...
umputun committed Jan 20, 2016
1 parent e92aa90 commit fe9732cf30995f6f8b3b5b7f010a70964112b8bd
Showing with 2 additions and 2 deletions.
  1. +2 −2 README.md
View
@@ -3,8 +3,8 @@
Quick instructions:
```bash
CID=$(docker run -d --privileged -p 1194:1194/udp -p 443:443/tcp umputun/openvpn)
docker run -t -i -p 8080:8080 --volumes-from $CID umputun/openvpn serveconfig
CID=$(docker run -d --privileged -p 1194:1194/udp -p 443:443/tcp umputun/dockvpn)
docker run -t -i -p 8080:8080 --volumes-from $CID umputun/dockvpn serveconfig
```
Now download the file located at the indicated URL. You will get a

5 comments on commit fe9732c

@osminogin

This comment has been minimized.

Show comment
Hide comment
@osminogin

osminogin Aug 10, 2016

Very useful changes.

osminogin replied Aug 10, 2016

Very useful changes.

@umputun

This comment has been minimized.

Show comment
Hide comment
@umputun

umputun Aug 10, 2016

not sure what this comment about, but as far as i recall the change you indicated was to match name of container with the one I build on dockerhub.

umputun replied Aug 10, 2016

not sure what this comment about, but as far as i recall the change you indicated was to match name of container with the one I build on dockerhub.

@osminogin

This comment has been minimized.

Show comment
Hide comment
@osminogin

osminogin Aug 10, 2016

Original sources licensed under Apache license, so you need:

  1. Identify original author and link to them.

  2. Change the project name (under the terms of Apache license).

or ask author to license under different terms.

osminogin replied Aug 10, 2016

Original sources licensed under Apache license, so you need:

  1. Identify original author and link to them.

  2. Change the project name (under the terms of Apache license).

or ask author to license under different terms.

@umputun

This comment has been minimized.

Show comment
Hide comment
@umputun

umputun Aug 10, 2016

Dear author, do you care about any of this? The only reason for my fork existence is (was) to address key-size issue and make your wonderful container working again with tunnelblick asap. I thought github's "fork from" is adequate form of link to the original project. If by some reason you want me to rename the fork - sure I can do it if github supports such renames. But I don't think there is a reason to rename image on docker-hub. First - this is not the same (different prefix) and second - there are tens of blah/dockvpn repos on hub already.

umputun replied Aug 10, 2016

Dear author, do you care about any of this? The only reason for my fork existence is (was) to address key-size issue and make your wonderful container working again with tunnelblick asap. I thought github's "fork from" is adequate form of link to the original project. If by some reason you want me to rename the fork - sure I can do it if github supports such renames. But I don't think there is a reason to rename image on docker-hub. First - this is not the same (different prefix) and second - there are tens of blah/dockvpn repos on hub already.

@maximkulkin

This comment has been minimized.

Show comment
Hide comment
@maximkulkin

maximkulkin Aug 10, 2016

@osminogin

  1. Apache license does not require identifying or linking to original author. It requires to preserve license and all copyrights/trademarks/etc (section 4.a and 4.c of LICENSE). It is the original author responsibility to put copyrights in right places (e.g. at the end of LICENSE file, but right now there is only template line "Copyright [yyyy] [name of copyright owner]"). Other project files are not even copyrighted.
  2. It does not require in this case changing project name (section 6 of LICENSE):

This License does not grant permission to use ... product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work ...

Since almost all code is the original code, it is reasonable to use original project name.

maximkulkin replied Aug 10, 2016

@osminogin

  1. Apache license does not require identifying or linking to original author. It requires to preserve license and all copyrights/trademarks/etc (section 4.a and 4.c of LICENSE). It is the original author responsibility to put copyrights in right places (e.g. at the end of LICENSE file, but right now there is only template line "Copyright [yyyy] [name of copyright owner]"). Other project files are not even copyrighted.
  2. It does not require in this case changing project name (section 6 of LICENSE):

This License does not grant permission to use ... product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work ...

Since almost all code is the original code, it is reasonable to use original project name.

Please sign in to comment.