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.

Sign up for GitHub

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

Jump to bottom

vendor libp2p with gx #2256

Merged
merged 30 commits into from
Feb 6, 2016
Merged

vendor libp2p with gx #2256

merged 30 commits into from
Feb 6, 2016

Commits on Jan 30, 2016

  1. initial vendoring of libp2p outside of the repo with gx 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    0e312f5 View commit details
    Browse the repository at this point in the history

  2. package.json cleanup 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    e12a56d View commit details
    Browse the repository at this point in the history

  3. add makefile rule for grabbing gx and deps 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    3b784b5 View commit details
    Browse the repository at this point in the history

  4. go-keyspace dep from libp2p added 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    3d0aa59 View commit details
    Browse the repository at this point in the history

  5. correct go-log dep 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    0e8a670 View commit details
    Browse the repository at this point in the history

  6. add better makefile and reference gx stuff in readme 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    0dba051 View commit details
    Browse the repository at this point in the history

  7. go go circle tests! 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    1f1c52c View commit details
    Browse the repository at this point in the history

  8. circle.yml fix? 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    b16c0ce View commit details
    Browse the repository at this point in the history

  9. verbose gx install 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    9c05a0d View commit details
    Browse the repository at this point in the history

  10. gx install stuff in cmd/ipfs/Makefile 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    b5a93ea View commit details
    Browse the repository at this point in the history

  11. circleci verbose 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    b96c2e6 View commit details
    Browse the repository at this point in the history

  12. travis file change 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    d141589 View commit details
    Browse the repository at this point in the history

  13. circleci fun fun fun 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    1b6e426 View commit details
    Browse the repository at this point in the history

  14. i'm beginning to dislike circleci 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    bf3ad94 View commit details
    Browse the repository at this point in the history

  15. on a scale from 1 to annoying, i don't like circleCI anymore at all 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    ed3841f View commit details
    Browse the repository at this point in the history

  16. ciiiii issss awesome 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    89bb338 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2016

  1. circleci has bad documentation 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 31, 2016
    Configuration menu
    Copy the full SHA
    57c6e1e View commit details
    Browse the repository at this point in the history

  2. lets not have any documentation for this stupid file format, its awesome 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 31, 2016
    Configuration menu
    Copy the full SHA
    49ae649 View commit details
    Browse the repository at this point in the history

  3. also, yaml is a terrible format 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 31, 2016
    Configuration menu
    Copy the full SHA
    c900a1e View commit details
    Browse the repository at this point in the history

  4. documentation saves lives 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 31, 2016
    Configuration menu
    Copy the full SHA
    4012c6b View commit details
    Browse the repository at this point in the history

  5. update libp2p dep 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 31, 2016
    Configuration menu
    Copy the full SHA
    c0101c0 View commit details
    Browse the repository at this point in the history

  6. do that last thing again 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Jan 31, 2016
    Configuration menu
    Copy the full SHA
    2263539 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2016

  1. Rework the Dockerfile 

    - Have two Dockerfiles doing essentially the same,
  but optimized for build time (for tests)
  and image size (for Docker Hub)
- Fetch gx dependencies
- Expose port 4002 for utp
- Specify go version, currently 1.5.3-r0
- Create ephemeral fs-repo if none is mounted
- Have t0300-docker-image actually test IPFS, not just an echo
- Make everything a bit less hardcoded
- Remove dead shacheck

License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
    @whyrusleeping
    Lars Gierth authored and whyrusleeping committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    81c8cff View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2016

  1. sharness: disable t0300-docker-image on Circle CI 

    The actual tests for the IPFS daemon within the image,
which were added in the previous commits, made Circle CI unhappy.

Circle CI runs an old version of Docker
which still uses LXC instead of libcontainer.
The existing lxc-attach hack is testament to that.

We might be able to get it work [1][2]
but it's really not worth it at the moment,
and Circle CI isn't a good option for Docker things, right now.

[1] https://jpetazzo.github.io/2014/03/23/lxc-attach-nsinit-nsenter-docker-0-9/
[2] https://github.com/jpetazzo/nsenter

License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
    Lars Gierth committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    c103efc View commit details
    Browse the repository at this point in the history

  2. docker: save image space by excluding .git/ 

    License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
    Lars Gierth committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    ce0d62d View commit details
    Browse the repository at this point in the history

  3. Cleaned up README 

    I did the following:
- Capitalized IPFS wherever it did not explicitely refer to the CLI command
- Moved Dev Dependencies into the Install section
- Added a Table of Contents
- Capitalised and added periods to various sentences
- Capitalised Go
- Removed double empty lines
- Reindented a few sections to make the flow more clear.
- Added a note to the Install section about how to canonically install.

License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
    @RichardLitt
    RichardLitt committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    9ade210 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2302 from ipfs/feature/gx-libp2p-readme-edits 

    Cleaned up README
    @whyrusleeping
    whyrusleeping committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    ffc4831 View commit details
    Browse the repository at this point in the history

  5. makefile fixes 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Feb 5, 2016
    2 Configuration menu
    Copy the full SHA
    c9b83c5 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2016

  1. note in assets test 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Feb 6, 2016
    Configuration menu
    Copy the full SHA
    5c5ad7a View commit details
    Browse the repository at this point in the history

  2. add deps target to nofuse 

    License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
    @whyrusleeping
    whyrusleeping committed Feb 6, 2016
    Configuration menu
    Copy the full SHA
    3373138 View commit details
    Browse the repository at this point in the history