diff --git a/docker-compose.yml b/docker-compose.yml index 5919d1b84..73b970b7e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,12 +13,11 @@ services: image: "ocs-pysmurf-agent" build: ./docker/pysmurf_controller/ - # Temporarily disabled until https://github.com/simonsobs/socs/issues/1015 is resolved - #ocs-wgactuator-agent: - # image: "ocs-wgactuator-agent" - # build: ./docker/wiregrid_actuator/ - # depends_on: - # - "socs" + ocs-wgactuator-agent: + image: "ocs-wgactuator-agent" + build: ./docker/wiregrid_actuator/ + depends_on: + - "socs" # Only works with --privileged, will insist users build image themselves # ocs-hwp-picoscope-agent: diff --git a/docker/wiregrid_actuator/Dockerfile b/docker/wiregrid_actuator/Dockerfile index 5eac3b937..4613d4215 100644 --- a/docker/wiregrid_actuator/Dockerfile +++ b/docker/wiregrid_actuator/Dockerfile @@ -22,8 +22,8 @@ RUN apt-get update \ && rm -r /tmp/gcapsd/ \ && python3 -m pip install --upgrade pip \ && python3 -m pip install https://www.galil.com/sw/pub/python/gclib-1.0.0-py3-none-any.whl \ - && python3 -c "import gclib; print(f'gclib location: {gclib.__file__}'); print(f'gclib version: {gclib.py().GVersion()}');" + && python3 -c "import gclib; print(f'gclib location: {gclib.__file__}');" -COPY . . +COPY ./ ./ ENTRYPOINT ["./wg-actuator-entrypoint.sh"]