Merge pull request #123 from Wakoma/alpha_patch_01

Code fixes and final patches for alpha.

Author: jmwright

docker/Dockerfile

@@ -20,13 +20,13 @@ RUN pip install --upgrade pip
 RUN pip install pytest pylint
 
 WORKDIR /app
-RUN git clone https://github.com/Wakoma/nimble.git --branch alpha
+RUN git clone https://github.com/Wakoma/nimble.git --branch master
 
 WORKDIR /app/nimble
 RUN pip install -e .
 
 WORKDIR /app
-RUN git clone https://gitlab.com/gitbuilding/cadorchestrator.git --branch server_hotfix_01
+RUN git clone https://gitlab.com/gitbuilding/cadorchestrator.git --branch master
 
 WORKDIR /app/cadorchestrator/js/cadorchestrator-app
 RUN bun install && \
@@ -35,10 +35,6 @@ RUN bun install && \
 WORKDIR /app/cadorchestrator
 RUN pip install -e .
 
-
-ARG NOCODB_TOKEN
-ENV NOCODB_TOKEN=${NOCODB_TOKEN}
-
 WORKDIR /app/nimble
 RUN Xvfb :98 -screen 0 1024x768x24 & \
     export DISPLAY=:98 && \
@@ -47,8 +43,7 @@ RUN Xvfb :98 -screen 0 1024x768x24 & \
 RUN rm -rf build _cache_ _gb_temp_ && \
     rm OrchestratorConfigOptions.json devices.json
 
-RUN nimble_devices_updater && \
-    gen_nimble_conf_options
+RUN gen_nimble_conf_options
 
 RUN pip freeze -l > requirements_inbuild.txt
 

docker/Dockerfile.dev

@@ -0,0 +1,62 @@
+FROM python:3.10-slim
+
+RUN apt-get update && apt-get install -y \
+    git \
+    curl \
+    xvfb \
+    fontconfig \
+    unzip \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN curl -fsSL https://bun.sh/install | bash && \
+    mv /root/.bun/bin/bun /usr/local/bin/bun
+
+WORKDIR /app
+ENV VIRTUAL_ENV=/app/venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+RUN pip install --upgrade pip
+
+RUN pip install pytest pylint
+
+WORKDIR /app
+RUN git clone https://github.com/Wakoma/nimble.git --branch master
+
+WORKDIR /app/nimble
+RUN pip install -e .
+
+WORKDIR /app
+RUN git clone https://gitlab.com/gitbuilding/cadorchestrator.git --branch master
+
+WORKDIR /app/cadorchestrator/js/cadorchestrator-app
+RUN bun install && \
+    bun run build
+
+WORKDIR /app/cadorchestrator
+RUN pip install -e .
+
+
+ARG NOCODB_TOKEN
+ENV NOCODB_TOKEN=${NOCODB_TOKEN}
+
+WORKDIR /app/nimble
+RUN Xvfb :98 -screen 0 1024x768x24 & \
+    export DISPLAY=:98 && \
+    python -m pytest
+
+RUN rm -rf build _cache_ _gb_temp_ && \
+    rm OrchestratorConfigOptions.json devices.json
+
+RUN nimble_devices_updater && \
+    gen_nimble_conf_options
+
+RUN pip freeze -l > requirements_inbuild.txt
+
+EXPOSE 8000
+
+WORKDIR /app
+COPY entrypoint.sh /app/entrypoint.sh
+RUN ["chmod","+x","entrypoint.sh"]
+
+WORKDIR /app/nimble
+ENTRYPOINT ["/app/entrypoint.sh"]

docker/Dockerfile.prod

@@ -7,7 +7,7 @@
 import os
 from copy import deepcopy
 import posixpath
-import logging
+
 
 from cadorchestrator.components import (GeneratedMechanicalComponent,
                                         AssembledComponent,
@@ -17,6 +17,8 @@
 from nimble_build_system.cad.shelf import create_shelf_for
 from nimble_build_system.orchestration.paths import REL_MECH_DIR
 
+
+
 def create_assembly(config_dict):
     """Function uses device id list for nimble configuration assembly."""
     selected_device_ids = config_dict['device-ids']
@@ -106,8 +108,6 @@ def _main_assembly_docs(self):
         return md
 
     def _inserting_shelf_docs(self):
-        logging.info("-"*10)
-
         broad_shelf_mds = []
         std_shelf_mds = []
         for i, shelf in enumerate(self._shelves):
@@ -137,7 +137,6 @@ def devices(self):
         """
         Return the devices in this configuration as a list of Device objects
         """
-
         return [shelf.device for shelf in self._shelves]