From 2fc6fbdc832227d21dc80278ddcb9457df2b20bf Mon Sep 17 00:00:00 2001 From: Shunsuke Adachi Date: Thu, 19 Mar 2026 15:44:08 +0900 Subject: [PATCH 1/3] update for fixing bug of wiregrid actuator docker bulding --- docker/wiregrid_actuator/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/wiregrid_actuator/Dockerfile b/docker/wiregrid_actuator/Dockerfile index 5eac3b937..9ef29b973 100644 --- a/docker/wiregrid_actuator/Dockerfile +++ b/docker/wiregrid_actuator/Dockerfile @@ -22,8 +22,9 @@ 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__}');" +# && python3 -c "import gclib; print(f'gclib location: {gclib.__file__}'); print(f'gclib version: {gclib.py().GVersion()}');" -COPY . . +COPY ./ ./ ENTRYPOINT ["./wg-actuator-entrypoint.sh"] From ad26665b9b8ac13c82edf48e68e11306152d4743 Mon Sep 17 00:00:00 2001 From: Shunsuke Adachi Date: Thu, 19 Mar 2026 15:44:27 +0900 Subject: [PATCH 2/3] update for fixing bug of wiregrid actuator docker bulding --- docker/wiregrid_actuator/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/wiregrid_actuator/Dockerfile b/docker/wiregrid_actuator/Dockerfile index 9ef29b973..4613d4215 100644 --- a/docker/wiregrid_actuator/Dockerfile +++ b/docker/wiregrid_actuator/Dockerfile @@ -23,7 +23,6 @@ RUN apt-get update \ && 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__}');" -# && python3 -c "import gclib; print(f'gclib location: {gclib.__file__}'); print(f'gclib version: {gclib.py().GVersion()}');" COPY ./ ./ From e5539fbbf758410cdd957dc3d8713329db9e48a5 Mon Sep 17 00:00:00 2001 From: Brian Koopman Date: Thu, 19 Mar 2026 09:21:55 -0400 Subject: [PATCH 3/3] Revert "wg-actuator: Disable wgactuator image build (#1016)" This reverts commit 95738cec522a148afd4877a75e794364ae6204de. --- docker-compose.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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: