Feature/cca daq

.github/workflows/build.yaml

@@ -24,20 +24,20 @@ jobs:
     steps:
 
       - name: Checkout the repo 
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
         id: setup_buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
 
       - name: Build
         id: build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v3
         env:
           BASE_IMAGE_TAG: ${{ env.BASE_IMAGE_VER }}-dev
         with:
@@ -81,13 +81,13 @@ jobs:
     steps:
 
       - name: Checkout the repo 
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
       - name: Docker meta
         id: docker_meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v3
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |
@@ -99,24 +99,24 @@ jobs:
             type=ref,event=pr
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
         id: setup_buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
         with:
           buildkitd-flags: --debug
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
         id: build_push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v3
         env:
           BASE_IMAGE_TAG: ${{ env.BASE_IMAGE_VER }}${{ matrix.tag-suffix }}
         with:

Dockerfile

@@ -5,10 +5,27 @@ ARG img_tag=v5.1.5
 
 FROM ${img_user}/${img_repo}:${img_tag}
 
+ARG enable_daq
+ENV ENABLE_DAQ=${enable_daq}
+
 COPY . /usr/local/src_dragonfly
 
 WORKDIR /usr/local/src_dragonfly
+RUN if [ "$ENABLE_DAQ" = "true" ]; then \
+    pip install \
+    numpy==1.26.4 \
+    scipy==1.14.1 \
+    backports.ssl_match_hostname==3.7.0.1 \
+    katcp==0.9.3; \
+    git clone https://github.com/project8/adc_tests.git; \
+    cd adc_tests; \
+    git checkout master; \
+    pip install .; \ 
+    cd ..; \ 
+    apt update; \
+    apt install -y iputils-ping; \
+    fi
 RUN pip install docker pymodbus
 RUN pip install .
 
-WORKDIR /
+WORKDIR /

Dockerfile-DAQ

@@ -0,0 +1,18 @@
+ARG img_user=ghcr.io/driplineorg
+ARG img_repo=dripline-python
+#ARG img_tag=develop-dev
+ARG img_tag=v5.1.5
+
+FROM ${img_user}/${img_repo}:${img_tag}
+
+COPY . /usr/local/src_dragonfly
+
+# DAQ specific dependencies
+RUN git clone https://github.com/your-repo/katcp_wrapper.git && \
+    pip install -e katcp_wrapper
+
+WORKDIR /usr/local/src_dragonfly
+RUN pip install docker pymodbus
+RUN pip install .
+
+WORKDIR /

auths.json

@@ -0,0 +1,11 @@
+{
+    "amqp": {
+        "broker": "rabbit-broker",
+        "username": "dripline",
+        "password": "dripline"
+    },
+    "postgresql": {
+        "username": "postgres",
+        "password": ""
+    }
+}

dripline/extensions/__init__.py

@@ -3,11 +3,13 @@
 __path__ = __import__('pkgutil').extend_path(__path__, __name__)
 
 # Subdirectories
-from . import jitter
 
 # Modules in this directory
-
-from .add_auth_spec import *
+from .daq_run_interface import *
+from .psyllid_interface import *
+from .r2daq import *
+from .roach_daq_run_interface import *
+from .roach2_interface import *
 from .cmd_endpoint import *
 from .asteval_endpoint import *
 from .thermo_fisher_endpoint import *