Skip to content

Commit b969988

Browse files
committed
Remove references to docker-osx
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
1 parent 2680756 commit b969988

7 files changed

Lines changed: 9 additions & 13 deletions

File tree

docs/django.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Then, run `fig up`:
8383
myapp_web_1 | Starting development server at http://0.0.0.0:8000/
8484
myapp_web_1 | Quit the server with CONTROL-C.
8585

86-
And your Django app should be running at [localhost:8000](http://localhost:8000) (or [localdocker:8000](http://localdocker:8000) if you're using docker-osx).
86+
And your Django app should be running at port 8000 on your docker daemon (if you're using boot2docker, `boot2docker ip` will tell you its address).
8787

8888
You can also run management commands with Docker. To set up your database, for example, run `fig up` and in another terminal run:
8989

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Now if we run `fig up`, it'll pull a Redis image, build an image for our own cod
113113
redis_1 | [8] 02 Jan 18:43:35.576 # Server started, Redis version 2.8.3
114114
web_1 | * Running on http://0.0.0.0:5000/
115115

116-
Open up [http://localhost:5000](http://localhost:5000) in your browser (or [http://localdocker:5000](http://localdocker:5000) if you're using [docker-osx](https://github.com/noplay/docker-osx)) and you should see it running!
116+
The web app should now be listening on port 5000 on your docker daemon (if you're using boot2docker, `boot2docker ip` will tell you its address).
117117

118118
If you want to run your services in the background, you can pass the `-d` flag to `fig up` and use `fig ps` to see what is currently running:
119119

docs/rails.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,6 @@ Finally, we just need to create the database. In another terminal, run:
9393

9494
$ fig run web rake db:create
9595

96-
And we're rolling—see for yourself at [localhost:3000](http://localhost:3000) (or [localdocker:3000](http://localdocker:3000) if you're using docker-osx).
96+
And we're rolling—your app should now be running on port 3000 on your docker daemon (if you're using boot2docker, `boot2docker ip` will tell you its address).
9797

9898
![Screenshot of Rails' stock index.html](https://orchardup.com/static/images/fig-rails-screenshot.png)

docs/wordpress.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,4 @@ if(file_exists($root.$path))
8888
}else include_once 'index.php';
8989
```
9090

91-
With those four files in place, run `fig up` inside your Wordpress directory and it'll pull and build the images we need, and then start the web and database containers. You'll then be able to visit Wordpress and set it up by visiting [localhost:8000](http://localhost:8000) - or [localdocker:8000](http://localdocker:8000) if you're using docker-osx.
91+
With those four files in place, run `fig up` inside your Wordpress directory and it'll pull and build the images we need, and then start the web and database containers. You'll then be able to visit Wordpress at port 8000 on your docker daemon (if you're using boot2docker, `boot2docker ip` will tell you its address).

docs/yml.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ expose:
8787
Mount paths as volumes, optionally specifying a path on the host machine
8888
(`HOST:CONTAINER`), or an access mode (`HOST:CONTAINER:ro`).
8989

90-
Note for fig on OSX: Mapping local volumes is currently unsupported on
91-
boot2docker. We recommend you use [docker-osx](https://github.com/noplay/docker-osx)
92-
if want to map local volumes on OSX.
93-
9490
```
9591
volumes:
9692
- /var/lib/mysql

fig/cli/command.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def dispatch(self, *args, **kwargs):
3434
raise errors.DockerNotFoundUbuntu()
3535
else:
3636
raise errors.DockerNotFoundGeneric()
37-
elif call_silently(['which', 'docker-osx']) == 0:
38-
raise errors.ConnectionErrorDockerOSX()
37+
elif call_silently(['which', 'boot2docker']) == 0:
38+
raise errors.ConnectionErrorBoot2Docker()
3939
else:
4040
raise errors.ConnectionErrorGeneric(self.get_client().base_url)
4141

fig/cli/errors.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ def __init__(self):
3939
""")
4040

4141

42-
class ConnectionErrorDockerOSX(UserError):
42+
class ConnectionErrorBoot2Docker(UserError):
4343
def __init__(self):
44-
super(ConnectionErrorDockerOSX, self).__init__("""
45-
Couldn't connect to Docker daemon - you might need to run `docker-osx shell`.
44+
super(ConnectionErrorBoot2Docker, self).__init__("""
45+
Couldn't connect to Docker daemon - you might need to run `boot2docker up`.
4646
""")
4747

4848

0 commit comments

Comments
 (0)