Skip to content

Commit

Permalink
Merge pull request #169 from simonsobs/develop
Browse files Browse the repository at this point in the history
Release v0.2.0
  • Loading branch information
BrianJKoopman authored May 20, 2021
2 parents 4dac21c + f3dd886 commit 006ac72
Show file tree
Hide file tree
Showing 49 changed files with 4,927 additions and 249 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ jobs:
pip install coveralls
coverage combine
coverage report
coveralls
coveralls --service=github
- name: Test documentation build
run: |
docker run --rm socs sh -c "make -C docs/ html"
docker run --rm -e READTHEDOCS=True socs sh -c "make -C docs/ html"
# Dockerize
- name: Build and push development docker image
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/official-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Test documentation build
run: |
docker run --rm socs sh -c "make -C docs/ html"
docker run --rm -e READTHEDOCS=True socs sh -c "make -C docs/ html"
# Dockerize
- name: Build and push official docker image
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
pip install coveralls
coverage combine
coverage report
coveralls
coveralls --service=github
- name: Test documentation build
run: |
docker run --rm socs sh -c "make -C docs/ html"
docker run --rm -e READTHEDOCS=True socs sh -c "make -C docs/ html"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# A container setup with an installation of socs.

# Use the ocs image as a base
FROM simonsobs/ocs:v0.7.1
FROM simonsobs/ocs:v0.8.0

# Copy the current directory contents into the container at /app
COPY . /app/socs/
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ SOCS - Simons Observatory Control System
:target: https://github.com/simonsobs/socs/actions?query=workflow%3A%22Build+Develop+Images%22
:alt: GitHub Workflow Status

.. image:: https://readthedocs.org/projects/socs/badge/?version=latest
:target: https://socs.readthedocs.io/en/latest/?badge=latest
.. image:: https://readthedocs.org/projects/socs/badge/?version=develop
:target: https://socs.readthedocs.io/en/develop/?badge=develop
:alt: Documentation Status

.. image:: https://coveralls.io/repos/github/simonsobs/socs/badge.svg?branch=travis
Expand Down
19 changes: 19 additions & 0 deletions agents/chwp/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# CHWP Agent

# Use socs base image
FROM socs:latest

# Set the working directory to registry directory
WORKDIR /app/socs/agents/chwp/

# Copy this agent into the app/agents directory
COPY . .

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

# Sensible default arguments
CMD ["--site-hub=ws://crossbar:8001/ws", \
"--site-http=http://crossbar:8001/call"]

EXPOSE 8080/udp
Loading

0 comments on commit 006ac72

Please sign in to comment.