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

Build/README updates #3378

Merged
merged 8 commits into from
Jan 11, 2016
Merged

Build/README updates #3378

merged 8 commits into from
Jan 11, 2016

Conversation

oxtoacart
Copy link
Contributor

This has a few updates:

  1. Support use of newest Docker Tools on Mac. The script should still work with boot2docker, but it will use the newer docker-machine command if available.
  2. Support building mobile locally.
  3. Made pre-push hook work on pre-push (as originally written, it didn't seem to work for pre-push because it was using git status which only looks at the working tree, not comparing remote to origin)
  4. Added some more details to README

@oxtoacart oxtoacart changed the title Valencia ox Build/README updates Dec 31, 2015
oxtoacart
oxtoacart reviewed Jan 7, 2016
View reviewed changes
README.md
docker-machine rm default
docker-machine create --driver virtualbox --virtualbox-cpu-count 2 --virtualbox-memory 4096 default
```

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice. I've adde that to the README.

oxtoacart
oxtoacart reviewed Jan 8, 2016
View reviewed changes
README.md
```bash
git clone https://github.com/getlantern/mobile.git $GOPATH/src/golang.org/x/mobile
cd $GOPATH/src/golang.org/x/mobile/cmd/gomobile
go install .
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes, thanks! Fixed.

xiam
xiam reviewed Jan 9, 2016
View reviewed changes
src/github.com/getlantern/lantern-mobile/Dockerfile
@@ -5,7 +5,7 @@
FROM fedora:22
MAINTAINER "Ulysses Aalto" <uaalto@getlantern.org>

ENV GO_VERSION go1.5.1
ENV GO_VERSION go1.5.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can safely remove this line.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed.

fffw added a commit that referenced this pull request Jan 11, 2016
@fffw
Merge pull request #3378 from getlantern/valencia_ox
117238c 
Build/README updates
@fffw fffw merged commit 117238c into valencia Jan 11, 2016
@fffw fffw deleted the valencia_ox branch January 11, 2016 01:39
@getlantern getlantern deleted a comment from fffw Mar 3, 2021
@getlantern getlantern deleted a comment from fffw Mar 3, 2021
@getlantern getlantern deleted a comment from fffw Mar 3, 2021
@getlantern getlantern deleted a comment from fffw Mar 3, 2021
@getlantern getlantern deleted a comment from fffw Mar 3, 2021
@getlantern getlantern deleted a comment from fffw Mar 3, 2021
@getlantern getlantern deleted a comment from fffw Mar 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@oxtoacart @xiam @uaalto @fffw