Skip to content

Commit 5ba749e

Browse files
authored
Merge pull request #3243 from jeff1evesque/feature-3242
#3242: Adjust 'README.md' regarding docker-compose
2 parents 7bca100 + 7527a3c commit 5ba749e

File tree

2 files changed

+43
-6
lines changed

2 files changed

+43
-6
lines changed

README.md

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,17 @@ Fork this project, using of the following methods:
3434

3535
## Installation
3636

37-
To proceed with the installation for this project, both docker and rancher must be
38-
installed. Installing docker must be done manually, to fulfill a set of [dependencies](https://jeff1evesque.github.io/machine-learning.docs/latest/html/installation/dependencies.html).
37+
To proceed with the installation for this project, users will need to decide
38+
whether to use the rancher ecosystem, or use `docker-compose`. The former will
39+
likely be less reliable, since the corresponding install script, may not work
40+
nicely across different operating systems. Additionally, this project will
41+
assume rancher as the primary method to deploy, and run the application. So,
42+
when using the `docker-compose` alternate, keep track what the corresponding
43+
[endpoints](https://github.com/jeff1evesque/machine-learning/blob/master/README.md#execution)
44+
should be.
45+
46+
If users choose rancher, both docker and rancher must be installed.
47+
Installing docker must be done manually, to fulfill a set of [dependencies](https://jeff1evesque.github.io/machine-learning.docs/latest/html/installation/dependencies.html).
3948
Once completed, rancher can be installed, and automatically configured, by simply
4049
executing a provided bash script, from the docker quickstart terminal:
4150

@@ -47,11 +56,28 @@ cd /path/to/machine-learning
4756
**Note:** the installation, and the configuration of rancher, has been [outlined](https://jeff1evesque.github.io/machine-learning.docs/latest/html/installation/rancher.html)
4857
if more explicit instructions are needed.
4958

59+
If users choose to forgo rancher, and use the `docker-compose`, then simply
60+
install `docker`, as well as `docker-compose`. This will allow the application
61+
to be deployed from any terminal console:
62+
63+
```bash
64+
cd /path/to/machine-learning
65+
docker-compose up
66+
```
67+
68+
**Note:** the installation, and the configuration of `docker-compose`, has been [outlined](https://jeff1evesque.github.io/machine-learning.docs/latest/html/installation/docker-compose.html)
69+
if more explicit instructions are needed.
70+
5071
## Execution
5172

5273
Both the web-interface, and the programmatic-api, have corresponding
5374
[unit tests](https://github.com/jeff1evesque/machine-learning/blob/master/doc/test/pytest.rst)
54-
which can be reviewed, and implemented.
75+
which can be reviewed, and implemented. It is important to remember,
76+
the installation of this application will dictate the endpoint. More
77+
specifically, if the application was installed via rancher, then the
78+
endpoint will take the form of `https://192.168.99.101:XXXX`. However,
79+
if the `docker-compose up` alternate was used, then the endpoint will
80+
likely change to `https://localhost:XXXX`, or `https://127.0.0.1:XXXX`.
5581

5682
### Web Interface
5783

doc/installation/docker-compose.rst

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,21 @@ This allows various respective docker containers, to be managed consistently.
77
However, before proceeding, it is important to follow the |docker|_ , and
88
|docker-compose|_ installation guide.
99

10-
Once docker-compose has installed, simply run ``docker-compose up``, in the
11-
root directory of this cloned project. This will allow the web-application to
10+
Once docker-compose has installed, simply run ``docker-compose up``:
11+
12+
.. code:: bash
13+
14+
cd /path/to/machine-learning
15+
docker-compose up
16+
17+
This will allow the web-application to
1218
be accessible on the host machine, via https://localhost:8080. Similarly, the
13-
programmatic-api will be accessible at https://localhost:9090.
19+
programmatic-api will be accessible at https://localhost:9090. However, since
20+
this project assumes rancher as the primary method to deploy, and run the
21+
application, it will be important to remember when reading through this
22+
documentation, to substitute the localhost, or the `https://127.0.0.1:XXXX`
23+
address, in place of the `https://192.168.99.101:XXXX` endpoint. This will
24+
allow users to perform the same tasks outlined throughout this documentation.
1425

1526
.. |docker-compose| replace:: docker-compose
1627
.. _docker-compose: https://docs.docker.com/compose/install/#install-compose

0 commit comments

Comments
 (0)