Skip to content

Commit

Permalink
Move agent requirements to specific Agent directories
Browse files Browse the repository at this point in the history
  • Loading branch information
BrianJKoopman committed Sep 14, 2020
1 parent 0284305 commit e6ca9a5
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ COPY . /app/ocs/
WORKDIR /app/ocs/

# Install ocs
RUN pip3 install -r requirements.txt && \
RUN pip3 install -r requirements/dev.txt && \
pip3 install -e .
3 changes: 3 additions & 0 deletions agents/influxdb_publisher/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ FROM ocs:latest
WORKDIR /app/ocs/agents/influxdb_publisher/

COPY influxdb_publisher.py .
COPY requirements.txt .

RUN pip3 install -r requirements.txt

# Run publisher on container startup
ENTRYPOINT ["python3", "-u", "influxdb_publisher.py"]
Expand Down
1 change: 1 addition & 0 deletions agents/influxdb_publisher/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
influxdb
3 changes: 0 additions & 3 deletions docs/user/dependencies.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ which refers to ``requirements.txt``, and is covered in the next page. Other
dependencies must be explitly installed. For convenience these are split into
groups based on various tasks OCS users might want to accomplish.

* ``agents.txt`` - Dependencies for running OCS Agents on a host system. Most
commonly Agents will be run in Docker containers, which come with the
required dependencies already installed.
* ``crossbar.txt`` - The crossbar server and any dependencies it might have.
This pulls in a lot of other python packages, some of which conflict with
other dependencies in OCS. We strongly encourage using the crossbar Docker
Expand Down
2 changes: 1 addition & 1 deletion docs/user/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ To install, clone the repository and use pip to install::
additional dependnecies listed in the files within ``requirements/``. You can
do so using pip. For example::

pip3 install -r requirements/agents.txt
pip3 install -r requirements/dev.txt

.. _Docker Compose: https://docs.docker.com/compose/install/
4 changes: 0 additions & 4 deletions requirements/agents.txt

This file was deleted.

1 change: 0 additions & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
-r agents.txt
-r clients.txt
-r docs.txt

Expand Down

0 comments on commit e6ca9a5

Please sign in to comment.