Merge pull request #1702 from hornc/docker

move docker-compose to project root
internetarchive · Dec 18, 2018 · faf4f06 · faf4f06
2 parents c859552 + 84205f3
commit faf4f06
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/docker/docker-compose.yml → docker-compose.yml b/docker/docker-compose.yml → docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - ol-nodemodules:/openlibrary/node_modules
       # The above volume mounts are required so that the local dev bind mount below
       # does not clobber the data generated inside the image / container
-      - ..:/openlibrary
+      - .:/openlibrary
     networks:
       - webnet
   solr:

diff --git a/docker/README.md b/docker/README.md
@@ -1,6 +1,6 @@
 # Welcome to the new Docker based Open Library development environment!
 
-These current Dockerfiles are designed to be an alternative to the previous Vagrant based development environment.
+These Dockerfiles replace the previous Vagrant based development environment.
 
 ## Setup/Teardown Commands
 
@@ -37,13 +37,13 @@ If you get permission issues while executing these commands please run git bash
 5. Continue setup as shown below.
 
 ### For All Users
-All commands are from the docker directory:
+All commands are from the project root directory:
 
 ```bash
 # build images
-docker build -t olbase:latest -f Dockerfile.olbase ..
-docker build -t oldev:latest -f Dockerfile.oldev ..
-docker build -t olsolr:latest -f Dockerfile.olsolr ..
+docker build -t olbase:latest -f docker/Dockerfile.olbase .
+docker build -t oldev:latest -f docker/Dockerfile.oldev .
+docker build -t olsolr:latest -f docker/Dockerfile.olsolr .
 
 # start the app
 docker-compose up # Ctrl-C to stop