Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move uproxy-docker here #2841

Merged
merged 394 commits into from
Dec 14, 2016
Merged

move uproxy-docker here #2841

merged 394 commits into from
Dec 14, 2016

Conversation

trevj
Copy link
Contributor

@trevj trevj commented Dec 8, 2016

This copies across all of https://github.com/uProxy/uproxy-docker to a new folder named docker.

This will make it a lot easier to develop changes affecting both repos. Motivation for doing this now is to make Node.js development easier.

The files are unchanged except for the -p option of run_pair.sh and run_cloud.sh which changes from a string flag meaning "pull the zork from the client at this path" to a boolean flag meaning "use the Zork in this client".

@jab FYI


This change is Reviewable

trevj and others added 30 commits October 21, 2015 16:40
a script to create a cloud instance
update firefox download logic for new download system
replace passwords in invite codes with private keys
@dborkan
Copy link
Contributor

dborkan commented Dec 13, 2016

👍 for this change, although it seems like we might need to wait a while before we remove the uproxy-docker repo, since users currently have versions of uProxy installed which refer to install-cloud.sh in that repo right? It seems like maybe the next step will be to change https://github.com/uProxy/uproxy-cloud-install/blob/master/src/digital-ocean-installer.ts#L48 to refer to the new location

@trevj
Copy link
Contributor Author

trevj commented Dec 14, 2016

Yes! It's not quite time to update all the references to uproxy-docker - but I do agree that should be next and should happen soon.

Thanks for reviewing, I know this wasn't very easy to examine :-)

@trevj trevj merged commit ffab27e into master Dec 14, 2016
@trevj trevj deleted the trevj-uproxy-docker branch January 4, 2017 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants