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
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Oct 21, 2015

  1. Configuration menu
    Copy the full SHA
    ff6b3cf View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2015

  1. Configuration menu
    Copy the full SHA
    59fedbb View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2015

  1. osx now uses docker-machine

    Trevor Johnston committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    af65801 View commit details
    Browse the repository at this point in the history
  2. make run_cloud.sh run on osx

    Trevor Johnston committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    2b5800f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b541819 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #29 from uProxy/trevj-osx-fixes

    osx now uses docker-machine
    trevj committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    f44a4c5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f162a51 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4e6cee5 View commit details
    Browse the repository at this point in the history
  7. right args for cp

    trevj committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    67e618a View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    99e2e8a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    0cecb2e View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2015

  1. Configuration menu
    Copy the full SHA
    0854b1b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5723b32 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2015

  1. output the vm ip on osx

    trevj committed Nov 9, 2015
    Configuration menu
    Copy the full SHA
    115b477 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #30 from uProxy/trevj-flood-osx-fix

    output the vm ip on osx
    trevj committed Nov 9, 2015
    Configuration menu
    Copy the full SHA
    f6c84fd View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2015

  1. Configuration menu
    Copy the full SHA
    9378094 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2015

  1. Configuration menu
    Copy the full SHA
    d96e0e7 View commit details
    Browse the repository at this point in the history
  2. forget osx support for now

    trevj committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    8b8b8cc View commit details
    Browse the repository at this point in the history
  3. zork is fast, need more dots

    trevj committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    7c83bcd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f1b765c View commit details
    Browse the repository at this point in the history
  5. Merge pull request #31 from uProxy/trevj-social-cloud

    a script to create a cloud instance
    trevj committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    6c45a28 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2015

  1. Configuration menu
    Copy the full SHA
    33bab67 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    63c99e1 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2015

  1. Configuration menu
    Copy the full SHA
    8386ddd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c046a13 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c1a6c01 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2015

  1. Configuration menu
    Copy the full SHA
    f1e447d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #33 from uProxy/trevj-ff-download-fix

    update firefox download logic for new download system
    trevj committed Nov 18, 2015
    Configuration menu
    Copy the full SHA
    9c04479 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #32 from uProxy/trevj-keys

    replace passwords in invite codes with private keys
    trevj committed Nov 18, 2015
    Configuration menu
    Copy the full SHA
    0065a2b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    92cdbc6 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2015

  1. Merge pull request #34 from uProxy/trevj-acceptuserinvitation

    add to invite codes fields required for uproxy to accept tokens
    trevj committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    d888952 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    18587b6 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2015

  1. Merge pull request #35 from uProxy/trevj-banner

    add notion of a banner, which can be used as an instance description
    trevj committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    dbb1e71 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2015

  1. Configuration menu
    Copy the full SHA
    8cdf4aa View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2015

  1. Merge pull request #36 from uProxy/trevj-token-decode-fix

    fix for decoding new token format
    trevj committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    8e74b5f View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2015

  1. pull banner from the current installation, if available, and use host…

    …name if unspecified
    trevj committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    802a4f6 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2016

  1. Merge pull request #37 from uProxy/trevj-cloud-updates

    pull banner from the current installation, if available
    trevj committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    ef3d547 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2016

  1. Configuration menu
    Copy the full SHA
    8086e2b View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2016

  1. Merge pull request #38 from uProxy/trevj-onetime-hostname

    have the uproxy-sshd container cache the hostname
    trevj committed Jan 7, 2016
    Configuration menu
    Copy the full SHA
    914273d View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2016

  1. Configuration menu
    Copy the full SHA
    4198352 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #39 from uProxy/trevj-restart

    run browser with supervisor, so it will automatically restart on crashes
    trevj committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    6e69e01 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2016

  1. cloud installs uproxy-lib from npm

    soycode committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    55497f2 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2016

  1. actually install uproxy-lib from npm

    soycode committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    f9618e0 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2016

  1. Configuration menu
    Copy the full SHA
    3faa4ac View commit details
    Browse the repository at this point in the history
  2. Merge pull request #40 from uProxy/trevj-zork-stats

    add a script to pull interesting stats from a zork log
    trevj committed Jan 19, 2016
    Configuration menu
    Copy the full SHA
    add28e9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e1df7cf View commit details
    Browse the repository at this point in the history
  4. missing $

    soycode committed Jan 19, 2016
    Configuration menu
    Copy the full SHA
    9f44258 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2016

  1. Configuration menu
    Copy the full SHA
    7eb2d7e View commit details
    Browse the repository at this point in the history
  2. pass npm parameter from run_cloud, tweaks

    soycode committed Jan 20, 2016
    Configuration menu
    Copy the full SHA
    1ce20b0 View commit details
    Browse the repository at this point in the history
  3. pass on the -n parameter to runargs

    soycode committed Jan 20, 2016
    Configuration menu
    Copy the full SHA
    cab25a3 View commit details
    Browse the repository at this point in the history
  4. no square bracket bash booleans

    soycode committed Jan 20, 2016
    Configuration menu
    Copy the full SHA
    51f52ba View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2016

  1. Merge pull request #42 from uProxy/trevj-issue-invite-url

    run_cloud should output a URL rather than plain invite code
    trevj committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    ab6f22b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    53d53b5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    455f42b View commit details
    Browse the repository at this point in the history
  4. Merge pull request #41 from uProxy/trevj-curl-installer

    add a script for one-line install via curl
    trevj committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    71606ba View commit details
    Browse the repository at this point in the history
  5. Merge pull request #44 from uProxy/jab-patch-1

    make it easier to spot and select invite code
    jab committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    7db15a7 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2016

  1. npm is boolean condition

    soycode committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    ed60ac4 View commit details
    Browse the repository at this point in the history
  2. path and args tweaks

    soycode committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    d5a6562 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2016

  1. dist directory fix

    soycode committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    816ae66 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2016

  1. get uproxy-lib from npm by default

    soycode committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    fc319f1 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #43 from uProxy/soycode-runcloudfromnpm

    Soycode runcloudfromnpm
    soycode committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    3a7325f View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2016

  1. Configuration menu
    Copy the full SHA
    5235f0b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9348064 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #45 from uProxy/trevj-zork-privacy

    restrict access to zork via iptables, on cloud
    trevj committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    f681a86 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c363f55 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #47 from uProxy/trevj-restart-fix

    remove the X lock so docker restart works better
    trevj committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    f0fbb6e View commit details
    Browse the repository at this point in the history
  6. add -u argument for updating cloud installs

    soycode committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    a1c8964 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2016

  1. Configuration menu
    Copy the full SHA
    5b06679 View commit details
    Browse the repository at this point in the history
  2. ! -z -> -n

    trevj committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    38f4c22 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b87248e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    419ec59 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #48 from uProxy/trevj-chrome-freeze-fix

    work around chrome startup issue with --load-and-launch-app
    trevj committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    4aac52a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    daea9e1 View commit details
    Browse the repository at this point in the history
  7. clarify short timeout on DO API

    trevj committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    5edae46 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #46 from uProxy/trevj-do-api

    use DigitalOcean metadata API to populate server description
    trevj committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    b6cde0a View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2016

  1. Configuration menu
    Copy the full SHA
    5986a44 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #50 from uProxy/trevj-zork-stats-giving-only

    report success rate only for zork sessions that GAVE access
    trevj committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    0ffab03 View commit details
    Browse the repository at this point in the history
  3. replace refresh with update and wipe flags

    soycode committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    34d5162 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master' into soycode-updatecloud

    soycode committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    1735d16 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2016

  1. tighten wipe flag logic

    soycode committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    be5328b View commit details
    Browse the repository at this point in the history
  2. fix conditional nesting

    soycode committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    c311987 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2016

  1. Configuration menu
    Copy the full SHA
    02e1be9 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #49 from uProxy/soycode-updatecloud

    add -u argument for updating cloud installs
    soycode committed Feb 2, 2016
    Configuration menu
    Copy the full SHA
    1c0cf5d View commit details
    Browse the repository at this point in the history
  3. Merge pull request #52 from uProxy/trevj-retry

    replace --silent-launch with three attempts to launch the browser
    trevj committed Feb 2, 2016
    Configuration menu
    Copy the full SHA
    373d854 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9166f53 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    208919d View commit details
    Browse the repository at this point in the history
  6. tiny fixes to -u and -w

    trevj committed Feb 2, 2016
    Configuration menu
    Copy the full SHA
    ae60364 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2016

  1. Merge pull request #53 from uProxy/trevj-run-cloud-polish

    assorted fixes for run_cloud.sh
    trevj committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    cf4bda7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f32c807 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2016

  1. Round 1 of centos fixes.

    mollyling committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    3158e91 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3321b44 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    346a44d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    21b7c09 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #54 from uProxy/mling-docker-centos

    Work on centos images.
    mollyling committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    f096f38 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2016

  1. cloud issue new format invites

    soycode committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    3ec6318 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2016

  1. revert spacing, remove unneeded escaping

    soycode committed Mar 2, 2016
    Configuration menu
    Copy the full SHA
    03de0a1 View commit details
    Browse the repository at this point in the history
  2. parameterize invite url format

    soycode committed Mar 2, 2016
    Configuration menu
    Copy the full SHA
    26f5926 View commit details
    Browse the repository at this point in the history
  3. invite url tweaks

    soycode committed Mar 2, 2016
    Configuration menu
    Copy the full SHA
    9fbc0b6 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #55 from uProxy/soycode-v2invites

    cloud issue new format invites
    soycode committed Mar 2, 2016
    Configuration menu
    Copy the full SHA
    2d0fac0 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2016

  1. Docker version check.

    mollyling committed Mar 4, 2016
    Configuration menu
    Copy the full SHA
    48fabde View commit details
    Browse the repository at this point in the history
  2. Added better explanation.

    mollyling committed Mar 4, 2016
    Configuration menu
    Copy the full SHA
    741fb15 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #56 from uProxy/mling-centos-docker-version-fix

    Mling centos docker version fix
    mollyling committed Mar 4, 2016
    Configuration menu
    Copy the full SHA
    01a28e0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f2ae549 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2016

  1. Configuration menu
    Copy the full SHA
    29dcb6a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    890884c View commit details
    Browse the repository at this point in the history
  3. Merge pull request #58 from uProxy/trevj-cleanup-run-cloud-stderr

    BUG FIX: only try to pull invite code if the container exists
    trevj committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    5cc0f07 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    85d3175 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5564a66 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2016

  1. Configuration menu
    Copy the full SHA
    d230a45 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8594678 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #57 from uProxy/trevj-back-to-ubuntu

    getting the Ubuntu band back together
    trevj committed Mar 8, 2016
    Configuration menu
    Copy the full SHA
    2d01676 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    bcaf92d View commit details
    Browse the repository at this point in the history
  5. Merge pull request #59 from uProxy/trevj-cloud-script-quick-fix

    remove stupid exit line used during testing
    trevj committed Mar 8, 2016
    Configuration menu
    Copy the full SHA
    45b6156 View commit details
    Browse the repository at this point in the history
  6. migrate authorized_keys, do not store the private key on the server, …

    …run issue_invite.sh via docker exec
    trevj committed Mar 8, 2016
    Configuration menu
    Copy the full SHA
    22a1813 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #60 from uProxy/trevj-auth-cleanup

    auth cleanup, including authorzed_keys migration
    trevj committed Mar 8, 2016
    Configuration menu
    Copy the full SHA
    81373d0 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2016

  1. Configuration menu
    Copy the full SHA
    b60fcd5 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2016

  1. Merge pull request #61 from uProxy/trevj-getter-initially

    issue a getter invite initially
    trevj committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    5677734 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3f32f72 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    570d0f6 View commit details
    Browse the repository at this point in the history
  4. use username as comment for authorized_keys lines, so we can identify…

    … who they are for later
    trevj committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    078c96d View commit details
    Browse the repository at this point in the history
  5. Ouput invite data in JSON format for installer

    Daniel Borkan committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    0702074 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5c194ed View commit details
    Browse the repository at this point in the history
  7. Changes for code review

    Daniel Borkan committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    b7a0dd1 View commit details
    Browse the repository at this point in the history
  8. Add space

    Daniel Borkan committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    a6dbd04 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #62 from uProxy/dborkan-invite-data

    Ouput invite data in JSON format for installer
    dborkan committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    89d29c7 View commit details
    Browse the repository at this point in the history
  10. indent shell scripts to 2 spaces

    soycode committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    c2b103c View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2016

  1. Merge pull request #64 from uProxy/soycode-bashindent

    switch bash files to all use 2-space indenting
    soycode committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    3f3ab94 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2016

  1. Merge pull request #63 from uProxy/trevj-tunnel-whitelisting

    lock down SSH access to the server
    trevj committed Mar 14, 2016
    Configuration menu
    Copy the full SHA
    22156eb View commit details
    Browse the repository at this point in the history
  2. move NPM download and building from source to image creation time, fo…

    …r much faster startup
    trevj committed Mar 14, 2016
    Configuration menu
    Copy the full SHA
    d36b45d View commit details
    Browse the repository at this point in the history
  3. update for new image_make args

    trevj committed Mar 14, 2016
    Configuration menu
    Copy the full SHA
    b2d13ff View commit details
    Browse the repository at this point in the history
  4. update for new image_make args

    trevj committed Mar 14, 2016
    Configuration menu
    Copy the full SHA
    463317b View commit details
    Browse the repository at this point in the history
  5. fix indentation

    trevj committed Mar 14, 2016
    Configuration menu
    Copy the full SHA
    23fae4f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9201633 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2016

  1. Merge pull request #65 from uProxy/trevj-faster-startup

    reduce image creation and container startup times
    trevj committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    29a99c0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    abb19fe View commit details
    Browse the repository at this point in the history
  3. more deps for firefox unstable

    trevj committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    1b8097d View commit details
    Browse the repository at this point in the history
  4. Merge pull request #66 from uProxy/trevj-ff-unstable-fix

    more deps for firefox unstable
    trevj committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    06be94a View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2016

  1. Configuration menu
    Copy the full SHA
    5390152 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #67 from uProxy/trevj-faster-sshd

    faster sshd image creation
    trevj committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    9a9b0b3 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2016

  1. Configuration menu
    Copy the full SHA
    da635b3 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #68 from uProxy/trevj-sh-fix

    QUICK FIX: sh does not have function keyword
    trevj committed Mar 17, 2016
    Configuration menu
    Copy the full SHA
    76799b3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a65f98b View commit details
    Browse the repository at this point in the history
  4. Merge pull request #69 from uProxy/trevj-json-fix

    QUICK FIX: output JSON last, for frontend installer
    trevj committed Mar 17, 2016
    Configuration menu
    Copy the full SHA
    6ad9147 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    418ebd8 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #70 from uProxy/trevj-json-and-jsurl-together-at-last

    FIX: actually output both JSON and JSURL
    trevj committed Mar 17, 2016
    Configuration menu
    Copy the full SHA
    c16a53f View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2016

  1. add unattended-upgrades to cloud and sshd images

    soycode committed Mar 18, 2016
    Configuration menu
    Copy the full SHA
    b721560 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2016

  1. Merge pull request #71 from uProxy/soycode-upgrades

    add unattended-upgrades to cloud image
    soycode committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    c914636 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fef955c View commit details
    Browse the repository at this point in the history
  3. Merge pull request #72 from uProxy/trevj-reduce-key-length

    reduce key length to get invite URLs below 2000 characters
    trevj committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    cf66767 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2016

  1. add uproxy-zork docker hub image

    soycode committed Mar 23, 2016
    Configuration menu
    Copy the full SHA
    028fffa View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2016

  1. Configuration menu
    Copy the full SHA
    9ae58be View commit details
    Browse the repository at this point in the history
  2. Dockerfiles for publishing sshd to hub, using it

    soycode committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    98cae05 View commit details
    Browse the repository at this point in the history
  3. temp copy files for docker build context

    soycode committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    1b88da2 View commit details
    Browse the repository at this point in the history
  4. use docker hub uproxy-sshd

    soycode committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    ef40294 View commit details
    Browse the repository at this point in the history
  5. allow specifying docker hub image via arg

    soycode committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    39ff072 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2016

  1. remove run_cloud.sh -> image_make.sh call

    soycode committed Mar 25, 2016
    Configuration menu
    Copy the full SHA
    18d257a View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2016

  1. tweak hub default, revert image_make

    soycode committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    c8dd655 View commit details
    Browse the repository at this point in the history
  2. tweak hub default, revert image_make

    soycode committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    2ccbaa3 View commit details
    Browse the repository at this point in the history
  3. remove $1 references

    soycode committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    1ff4974 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'soycode-dockerhub' of https://github.com/uproxy/uproxy-…

    …docker into soycode-dockerhub
    soycode committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    2431098 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2016

  1. re-add prebuilt flag, fix zork_dir ref

    soycode committed Mar 29, 2016
    Configuration menu
    Copy the full SHA
    32e1f32 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d287a94 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #74 from uProxy/trevj-install-progress

    output install progress updates to stdout
    trevj committed Mar 29, 2016
    Configuration menu
    Copy the full SHA
    cbd2e5f View commit details
    Browse the repository at this point in the history
  4. further streamline running docker image

    soycode committed Mar 29, 2016
    Configuration menu
    Copy the full SHA
    297140e View commit details
    Browse the repository at this point in the history
  5. let user build uproxy-sshd if desired

    soycode committed Mar 29, 2016
    Configuration menu
    Copy the full SHA
    b6fbbde View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2016

  1. Configuration menu
    Copy the full SHA
    b5043c3 View commit details
    Browse the repository at this point in the history
  2. FIX: issue_invite args

    trevj committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    e3e482a View commit details
    Browse the repository at this point in the history
  3. Merge pull request #76 from uProxy/trevj-issue_invite_args

    FIX: issue_invite args
    trevj committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    975e9c8 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2016

  1. Configuration menu
    Copy the full SHA
    9131e35 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #77 from uProxy/trevj-install-progress

    update progress bar counts, now that docker is pre-installed
    trevj committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    0c0e9b9 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2016

  1. switch from soycode to uproxy for docker hub

    soycode committed Apr 1, 2016
    Configuration menu
    Copy the full SHA
    9c9fd06 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2016

  1. Merge pull request #73 from uProxy/soycode-dockerhub

    add uproxy-zork docker hub image
    soycode committed Apr 4, 2016
    Configuration menu
    Copy the full SHA
    bf067a1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b443d08 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #78 from uProxy/trevj-update-quoting-fix

    workaround quoting issues in authorized_keys migration
    trevj committed Apr 4, 2016
    Configuration menu
    Copy the full SHA
    155115d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e3e8084 View commit details
    Browse the repository at this point in the history
  5. simplify sshd

    soycode committed Apr 4, 2016
    Configuration menu
    Copy the full SHA
    7043882 View commit details
    Browse the repository at this point in the history
  6. switch from Dockerfile to docker exec for sshd

    soycode committed Apr 4, 2016
    Configuration menu
    Copy the full SHA
    073b1ae View commit details
    Browse the repository at this point in the history
  7. only run sshd once

    soycode committed Apr 4, 2016
    Configuration menu
    Copy the full SHA
    031f217 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2016

  1. sshd docker hub tweaks

    soycode committed Apr 5, 2016
    Configuration menu
    Copy the full SHA
    894eb15 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cbd77f9 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2016

  1. Merge pull request #75 from uProxy/soycode-sshdhub

    Soycode sshdhub
    soycode committed Apr 6, 2016
    Configuration menu
    Copy the full SHA
    a03951b View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2016

  1. Configuration menu
    Copy the full SHA
    2bf9c2d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #79 from uProxy/trevj-sshd-update

    run apt-get update before installing any packages
    trevj committed Apr 7, 2016
    Configuration menu
    Copy the full SHA
    605321a View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2016

  1. Configuration menu
    Copy the full SHA
    4a1785e View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2016

  1. cleanup cloud migration code

    trevj committed Apr 11, 2016
    Configuration menu
    Copy the full SHA
    91a3a87 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2016

  1. Merge pull request #80 from uProxy/trevj-migration-cleanup

    cleanup cloud migration code
    trevj committed Apr 12, 2016
    Configuration menu
    Copy the full SHA
    ae5f9ee View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2016

  1. Configuration menu
    Copy the full SHA
    e7b8dd7 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2016

  1. Merge pull request #81 from uProxy/trevj-baseimage

    use phusion/baseimage for zork
    trevj committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    ae820d8 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2016

  1. remove some unused files

    trevj committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    478ca25 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e5275d2 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #83 from uProxy/trevj-run-pair-docker-hub

    remove dependency on image_make.sh from run_pair.sh
    trevj committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    ca63220 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2016

  1. Merge pull request #82 from uProxy/trevj-unused-files

    remove some unused files
    trevj committed Apr 25, 2016
    Configuration menu
    Copy the full SHA
    ec1bbe6 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2016

  1. Configuration menu
    Copy the full SHA
    cc7694a View commit details
    Browse the repository at this point in the history
  2. remove retries altogether

    trevj committed May 16, 2016
    Configuration menu
    Copy the full SHA
    235ae5d View commit details
    Browse the repository at this point in the history
  3. make browser and version args

    trevj committed May 16, 2016
    Configuration menu
    Copy the full SHA
    f40433c View commit details
    Browse the repository at this point in the history
  4. switch to python2

    trevj committed May 16, 2016
    Configuration menu
    Copy the full SHA
    ddc5119 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2016

  1. Configuration menu
    Copy the full SHA
    f5c8dc3 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2016

  1. Merge pull request #85 from uProxy/trevj-docker-hub-osx

    remove osx-specific hacks now docker hub is in beta
    trevj committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    99b9f12 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #84 from uProxy/trevj-release-cleanup

    remove release.py timeouts and make it easier to re-run specific tests
    trevj committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    4daeb27 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2016

  1. Configuration menu
    Copy the full SHA
    e0c4d6c View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2016

  1. Merge pull request #86 from uProxy/trevj-uproxy-lib

    update paths and args for pre-built mode, following uproxy-lib merge
    trevj committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    8bf77a8 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2016

  1. Configuration menu
    Copy the full SHA
    6cc5b5d View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2016

  1. Merge pull request #87 from uProxy/trevj-bangalore

    digitalocean has servers in bangalore now
    trevj committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    cc45511 View commit details
    Browse the repository at this point in the history
  2. remove unused git options

    trevj committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    e0b7208 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    04dd28d View commit details
    Browse the repository at this point in the history
  4. Merge pull request #88 from uProxy/trevj-no-more-npm

    move away from NPM for cloud images
    trevj committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    4b784d5 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2016

  1. Configuration menu
    Copy the full SHA
    d537058 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #89 from uProxy/trevj-update-update

    option to pass -u to run_cloud so updates can be performed via curl
    trevj committed Jun 30, 2016
    Configuration menu
    Copy the full SHA
    87441b3 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2016

  1. use official nodejs installer for jpm

    Trevor Johnston committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    8e62d89 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #91 from uProxy/trevj-jpm-fix

    use official nodejs installer for jpm
    trevj committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    21b00e5 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2016

  1. add support for node images

    Trevor Johnston committed Jul 20, 2016
    Configuration menu
    Copy the full SHA
    de4c020 View commit details
    Browse the repository at this point in the history
  2. update baseimage, for node

    Trevor Johnston committed Jul 20, 2016
    Configuration menu
    Copy the full SHA
    5c3b111 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #92 from uProxy/trevj-node

    add support for node images
    trevj committed Jul 20, 2016
    Configuration menu
    Copy the full SHA
    3ea9d14 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2016

  1. only install and run x for chrome and firefox

    Trevor Johnston committed Jul 22, 2016
    Configuration menu
    Copy the full SHA
    6d493a6 View commit details
    Browse the repository at this point in the history
  2. need to install bzip2 explicitly now

    Trevor Johnston committed Jul 22, 2016
    Configuration menu
    Copy the full SHA
    ea844e0 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2016

  1. Merge pull request #94 from uProxy/trevj-trim-node

    only install and run x for chrome and firefox
    trevj committed Jul 25, 2016
    Configuration menu
    Copy the full SHA
    1153da1 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2016

  1. expect flood server image to be on docker hub, do not rate limit the …

    …connection, and exhaust the pipe as fast as we can
    Trevor Johnston committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    ddb8a6b View commit details
    Browse the repository at this point in the history
  2. Dockerize Quiver

    Daniel Borkan committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    deee37d View commit details
    Browse the repository at this point in the history
  3. Change repo from dborkan to uproxy

    Daniel Borkan committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    ba16862 View commit details
    Browse the repository at this point in the history
  4. end all files in \n

    Daniel Borkan committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    4761f73 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2016

  1. Update script location, base image

    Daniel Borkan committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    f79b2dc View commit details
    Browse the repository at this point in the history
  2. Merge pull request #95 from uProxy/dborkan-quiver

    Dockerize Quiver Server
    dborkan committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    f4919a5 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #96 from uProxy/trevj-flood-love

    get flood server onto docker hub, with fixes
    trevj committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    31e6daf View commit details
    Browse the repository at this point in the history
  4. Write Quiver logs from docker container to syslogs

    Daniel Borkan committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    8433c05 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2016

  1. Fix logging

    Daniel Borkan committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    32b829c View commit details
    Browse the repository at this point in the history
  2. Merge pull request #97 from uProxy/dborkan-quiver

    Write Quiver logs from docker container to syslogs
    dborkan committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    a12ddc9 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2016

  1. update paths to account for new uproxy output folder (#98)

    * update paths to account for new uproxy output folder
    trevj committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    ed954ec View commit details
    Browse the repository at this point in the history
  2. use unbranded firefox builds (#99)

    * move to unbranded firefox builds
    trevj committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    ef9bfe5 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2016

  1. Configuration menu
    Copy the full SHA
    7b9dff3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e7c2b80 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2016

  1. Configuration menu
    Copy the full SHA
    1f3f471 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2016

  1. Add key to install-cloud, etc args

    Daniel Borkan committed Sep 28, 2016
    Configuration menu
    Copy the full SHA
    833957a View commit details
    Browse the repository at this point in the history
  2. Update git branch

    Daniel Borkan committed Sep 28, 2016
    Configuration menu
    Copy the full SHA
    b949346 View commit details
    Browse the repository at this point in the history
  3. add quotes to key arg

    Daniel Borkan committed Sep 28, 2016
    Configuration menu
    Copy the full SHA
    42790f0 View commit details
    Browse the repository at this point in the history
  4. remove ;

    Daniel Borkan committed Sep 28, 2016
    Configuration menu
    Copy the full SHA
    5018a51 View commit details
    Browse the repository at this point in the history
  5. add trace

    Daniel Borkan committed Sep 28, 2016
    Configuration menu
    Copy the full SHA
    6e6ed49 View commit details
    Browse the repository at this point in the history
  6. more trace

    Daniel Borkan committed Sep 28, 2016
    Configuration menu
    Copy the full SHA
    b56c7fa View commit details
    Browse the repository at this point in the history
  7. update git commands

    Daniel Borkan committed Sep 28, 2016
    Configuration menu
    Copy the full SHA
    e8fc75c View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2016

  1. Support base64 invite

    Daniel Borkan committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    3a1477f View commit details
    Browse the repository at this point in the history
  2. Cleanup

    Daniel Borkan committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    d6e08cc View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2016

  1. Changes for code review

    Daniel Borkan committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    b7d098d View commit details
    Browse the repository at this point in the history
  2. fix base64 arg

    Daniel Borkan committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    9092083 View commit details
    Browse the repository at this point in the history
  3. Update comment

    Daniel Borkan committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    3f2d980 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2016

  1. Add newline to end of issue_invite.sh

    Daniel Borkan committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    4e24ccd View commit details
    Browse the repository at this point in the history
  2. Merge pull request #105 from uProxy/dborkan-cloud-deploy

    Accept public key (-k option) for install-cloud scripts
    dborkan committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    c3915dd View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2016

  1. use socat for flood server to avoid weird issues with ncat on docker,…

    … move to alpine for smaller image (#106)
    trevj committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    e2f6506 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2016

  1. prepare for move to uproxy repo

    Trevor Johnston committed Dec 7, 2016
    Configuration menu
    Copy the full SHA
    35dc24d View commit details
    Browse the repository at this point in the history
  2. pull in files from uproxy-docker repo

    Trevor Johnston committed Dec 7, 2016
    Configuration menu
    Copy the full SHA
    593af32 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into trevj-uproxy-docker

    Trevor Johnston committed Dec 7, 2016
    Configuration menu
    Copy the full SHA
    5685946 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2016

  1. update -p options of newly imported docker scripts

    Trevor Johnston committed Dec 8, 2016
    Configuration menu
    Copy the full SHA
    98f171b View commit details
    Browse the repository at this point in the history