Skip to content
This repository has been archived by the owner on Aug 27, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/0.2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
hisapy committed Aug 11, 2016
2 parents 83f5459 + 258dbca commit 3ca8d84
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ _We will improve docs and code including test coverage in the next releases_

To run this software you need to install [Docker](https://www.docker.com/) on your system. It is very simple and there are a lot of guides and tutorials out there on the Internet.

>NOTICE: this was only tested in Unix like OS (Mac OS X and Ubuntu) but with should run on Windows without major problems.
>NOTICE: this was only tested in Unix like OS (Mac OS X and Ubuntu) but it should run on Windows without major problems.
## Usage Instructions

Expand Down Expand Up @@ -36,6 +36,8 @@ When the containers are all up and running, you can go inside the web app contai
`docker exec -it pwr2docker_web_1 bash`

> You can see the names of running containers with the command `docker ps` on your localhost
Once inside the container, you'll need to switch to **app** user in order to execute Elixir/Phoenix commands. To switch to **app** user run:

`su app`
Expand All @@ -50,7 +52,9 @@ Once switched to **app** user and in the `APP_HOME` directory, you can start the
`iex -S mix phoenix.server`

Now you're ready to start making requests to the web app on the ports you specified.
Now you're ready to start making requests to the web app on the port you specified.

> NOTICE that although deps are compiled when [building the image](Dockerfile#L49) the first time you start your phoenix.server all deps compiled again. We've created an [issue](https://github.com/elixir-lang/elixir/issues/5130) on Elixir repo to see if they can help us with this.
### Setup cloning this GitHub repo and building the image

Expand All @@ -64,8 +68,8 @@ Now you're ready to [start the containers](#usage-instructions) and try some stu
### Setup pulling Docker image from Docker Cloud repository

1. Open you console or terminal and execute `docker login`. You might not need this.
2. Pull the image from Docker Cloud. Execute `docker pull pwr2:latest`. You can also search for other **tags** besides latest.
3. Copy the [docker-compose.dev.example.yml](docker-compose.dev.example.yml) to **docker-compose.yml** your localhost and adjust the ports, [volumes](#about-docker-volumes) and **image** in **web** section to match the image tag you pulled in above step.
2. Pull the image from Docker Cloud. Execute `docker pull iporaitech/pwr2:latest`. You can also search for other **tags** besides latest.
3. Copy the [docker-compose.dev.example.yml](docker-compose.dev.example.yml) to **docker-compose.yml** on your localhost and adjust the ports, [volumes](#about-docker-volumes) and **image** in **web** section to match the image tag you pulled in the step above.

Now you're ready to [start the containers](#usage-instructions) and try some stuff.

Expand Down Expand Up @@ -156,7 +160,7 @@ See [package.json](package.json) to see the current versions of these NPM packag

[React](https://facebook.github.io/react/) is a Javascript library for building user interfaces.

See [package.json](package.json) to see the current versions of this NPM packages.
See [package.json](package.json) to see the current versions of these dependencies and other NPM packages in this project.

## Base Phoenix+Webpack project

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.dev.example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ db:
- "55434:5432"

mix_deps:
image: pwr2:latest
image: iporaitech/pwr2:latest
volumes:
- /home/app/mix_deps

0 comments on commit 3ca8d84

Please # to comment.