Skip to content

Commit

Permalink
Merge 95ee850 into 1d136a3
Browse files Browse the repository at this point in the history
  • Loading branch information
BrianJKoopman committed Sep 23, 2020
2 parents 1d136a3 + 95ee850 commit 4c7cb82
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ RUN apt-get update && apt-get install -y python3 \
python3-pip \
vim

# Install init system
RUN pip3 install dumb-init

# Copy the current directory contents into the container at /app
COPY . /app/ocs/

Expand Down
4 changes: 1 addition & 3 deletions agents/aggregator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ COPY aggregator_agent.py .
RUN mkdir -p /data && \
chown ocs:ocs /data



# Run registry on container startup
ENTRYPOINT ["python3", "-u", "aggregator_agent.py"]
ENTRYPOINT ["dumb-init", "python3", "-u", "aggregator_agent.py"]

# Sensible defaults for setup with sisock
CMD ["--site-hub=ws://crossbar:8001/ws", \
Expand Down
2 changes: 1 addition & 1 deletion agents/fake_data/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ WORKDIR /app/ocs/agents/fake_data/
COPY . .

# Run registry on container startup
ENTRYPOINT ["python3", "-u", "fake_data_agent.py"]
ENTRYPOINT ["dumb-init", "python3", "-u", "fake_data_agent.py"]

# Sensible defaults for setup with sisock
CMD ["--site-hub=ws://crossbar:8001/ws", \
Expand Down
2 changes: 1 addition & 1 deletion agents/influxdb_publisher/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ WORKDIR /app/ocs/agents/influxdb_publisher/
COPY influxdb_publisher.py .

# Run publisher on container startup
ENTRYPOINT ["python3", "-u", "influxdb_publisher.py"]
ENTRYPOINT ["dumb-init", "python3", "-u", "influxdb_publisher.py"]

# Sensible defaults for setup with sisock
CMD ["--site-hub=ws://crossbar:8001/ws", \
Expand Down
2 changes: 1 addition & 1 deletion agents/registry/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ WORKDIR /app/ocs/agents/registry/
COPY . .

# Run registry on container startup
ENTRYPOINT ["python3", "-u", "registry.py"]
ENTRYPOINT ["dumb-init", "python3", "-u", "registry.py"]

# Sensible defaults for setup with sisock
CMD ["--site-hub=ws://crossbar:8001/ws", \
Expand Down

0 comments on commit 4c7cb82

Please sign in to comment.