Fixed Docker script and README

Updated the Docker script to start the site correctly. The DIR variable was not being used in each place which it should have been used and this has allowed the removal of the `readlink -f` command which had compatibility issues with MacOS (#297).

The README did not have the change in name for the docker script reflected in all references so this has also been corrected.
This commit is contained in:
Fabrizio Lungo 2018-01-20 17:49:39 +00:00
parent 0a43da23c9
commit f2a8c8a0c5
2 changed files with 4 additions and 4 deletions

View file

@ -18,7 +18,7 @@ You can also run the development server using docker:
- Run `./docker.sh` from the project root - Run `./docker.sh` from the project root
- Access [localhost:8000](http://localhost:8000) in your browser - Access [localhost:8000](http://localhost:8000) in your browser
Both the `dev.sh` and `dev-docker.sh` scripts will initialise a configuration based on `data/config.php.example` if `data/config.php` does not exist. Both the `dev.sh` and `docker.sh` scripts will initialise a configuration based on `data/config.php.example` if `data/config.php` does not exist.
To run remotely, simply install PHP and configure Apache or your server of choice to serve `web/index.php`. To run remotely, simply install PHP and configure Apache or your server of choice to serve `web/index.php`.

View file

@ -3,14 +3,14 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
if [ ! -e "data/config.php" ]; then if [ ! -e "$DIR/data/config.php" ]; then
cp "$DIR/data/config.php.example" "$DIR/data/config.php" cp "$DIR/data/config.php.example" "$DIR/data/config.php"
fi fi
docker run --rm -it --name "dev.lbry.io" \ docker run --rm -it --name "dev.lbry.io" \
-v "$(readlink -f .):/usr/src/lbry.io" \ -v "$DIR:/usr/src/lbry.io" \
-w "/usr/src/lbry.io" \ -w "/usr/src/lbry.io" \
-p "127.0.0.1:8000:8000" \ -p "127.0.0.1:8000:8000" \
-u "$(id -u):$(id -g)" \ -u "$(id -u):$(id -g)" \
php:7-alpine \ php:7-alpine \
php --server "0.0.0.0:8000" --docroot "web/" "web/index.php" php --server "0.0.0.0:8000" --docroot "web/" "index.php"