introducing base node image to reduce duplication

zauberzeug · Aug 20, 2023 · d5c634c · d5c634c
1 parent ef6f427
commit d5c634c
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 120 deletions.
diff --git a/base_node.dockerfile b/base_node.dockerfile
@@ -0,0 +1,24 @@
+FROM zauberzeug/nicegui:1.2.13
+
+RUN apt-get update && \
+    apt-get install -y jpeginfo \
+    python3-pip \
+    libjpeg-dev \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app/
+
+RUN python3 -m pip install --upgrade pip
+
+# Install system packages required by Pillow
+# TODO upgrade to pillow >=10 in pyproject.toml
+RUN apt-get update && \
+    apt-get install -y \
+    libjpeg-dev\
+    && rm -rf /var/lib/apt/lists/*
+
+RUN python3 -m pip install --no-cache-dir "uvicorn[standard]"  tqdm async_generator aiofiles retry debugpy pytest-asyncio psutil icecream pytest "pytest-mock==3.6.1" autopep8 pynvml 
+RUN python3 -m pip install --no-cache-dir "learning-loop-node==0.7.53rc2"
+
+# while development this will be mounted but in deployment we need the latest code baked into the image
+ADD ./learning_loop_node /usr/local/lib/python3.11/site-packages/learning_loop_node
diff --git a/demo_segmentation_tool.dockerfile b/demo_segmentation_tool.dockerfile
@@ -1,27 +1,4 @@
-FROM zauberzeug/nicegui:1.2.13
-
-RUN apt-get update && \
-    apt-get install -y jpeginfo \
-    python3-pip \
-    libjpeg-dev \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /app/
-
-RUN python3 -m pip install --upgrade pip
-
-# Install system packages required by Pillow
-# TODO upgrade to pillow >=10 in pyproject.toml
-RUN apt-get update && \
-    apt-get install -y \
-    libjpeg-dev\
-    && rm -rf /var/lib/apt/lists/*
-
-RUN python3 -m pip install --no-cache-dir "uvicorn[standard]" tqdm numpy async_generator aiofiles retry debugpy pytest-asyncio psutil icecream psutil pytest autopep8 pynvml
-RUN python3 -m pip install --no-cache-dir "learning-loop-node==0.7.53rc2"
-
-RUN apt-get update && apt-get -y install libgl1
-RUN python3 -m pip install --no-cache-dir opencv-python
+FROM base_node:latest
 
 ADD ./mock_annotation_node /app
 ENV PYTHONPATH "${PYTHONPATH}:/app:/usr/local/lib/python3.11/site-packages"

diff --git a/mock_annotation_node.dockerfile b/mock_annotation_node.dockerfile
@@ -1,27 +1,4 @@
-FROM zauberzeug/nicegui:1.2.13
-
-RUN apt-get update && \
-    apt-get install -y jpeginfo \
-    python3-pip \
-    libjpeg-dev \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /app/
-
-RUN python3 -m pip install --upgrade pip
-
-# Install system packages required by Pillow
-# TODO upgrade to pillow >=10 in pyproject.toml
-RUN apt-get update && \
-    apt-get install -y \
-    libjpeg-dev\
-    && rm -rf /var/lib/apt/lists/*
-
-RUN python3 -m pip install --no-cache-dir "uvicorn[standard]" tqdm numpy async_generator aiofiles retry debugpy pytest-asyncio psutil icecream psutil pytest autopep8 pynvml
-RUN python3 -m pip install --no-cache-dir "learning-loop-node==0.7.53rc2"
-
-# while development this will be mounted but in deployment we need the latest code baked into the image
-ADD ./learning_loop_node /usr/local/lib/python3.11/site-packages/learning_loop_node
+FROM base_node:latest
 
 ADD ./mock_annotation_node /app
 ENV PYTHONPATH "${PYTHONPATH}:/app:/usr/local/lib/python3.7/site-packages"

diff --git a/mock_converter.dockerfile b/mock_converter.dockerfile
@@ -1,27 +1,4 @@
-FROM zauberzeug/nicegui:1.2.13
-
-RUN apt-get update && \
-    apt-get install -y jpeginfo \
-    python3-pip \
-    libjpeg-dev \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /app/
-
-RUN python3 -m pip install --upgrade pip
-
-# Install system packages required by Pillow
-# TODO upgrade to pillow >=10 in pyproject.toml
-RUN apt-get update && \
-    apt-get install -y \
-    libjpeg-dev\
-    && rm -rf /var/lib/apt/lists/*
-
-RUN python3 -m pip install --no-cache-dir "uvicorn[standard]"  tqdm debugpy icecream pytest autopep8 pynvml
-RUN python3 -m pip install --no-cache-dir "learning-loop-node==0.7.53rc2"
-
-# while development this will be mounted but in deployment we need the latest code baked into the image
-ADD ./learning_loop_node /usr/local/lib/python3.11/site-packages/learning_loop_node
+FROM base_node:latest
 
 COPY ./mock_converter/ /app
 ENV PYTHONPATH "${PYTHONPATH}:/app:/usr/local/lib/python3.11/site-packages"

diff --git a/mock_detector.dockerfile b/mock_detector.dockerfile
@@ -1,27 +1,4 @@
-FROM zauberzeug/nicegui:1.2.13
-
-RUN apt-get update && \
-    apt-get install -y jpeginfo \
-    python3-pip \
-    libjpeg-dev \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /app/
-
-RUN python3 -m pip install --upgrade pip
-
-# Install system packages required by Pillow
-# TODO upgrade to pillow >=10 in pyproject.toml
-RUN apt-get update && \
-    apt-get install -y \
-    libjpeg-dev\
-    && rm -rf /var/lib/apt/lists/*
-
-RUN python3 -m pip install --no-cache-dir "uvicorn[standard]" tqdm async_generator aiofiles retry debugpy pytest-asyncio psutil icecream pytest autopep8 pynvml
-RUN python3 -m pip install --no-cache-dir "learning-loop-node==0.7.53rc2"
-
-# while development this will be mounted but in deployment we need the latest code baked into the image
-ADD ./learning_loop_node /usr/local/lib/python3.11/site-packages/learning_loop_node
+FROM base_node:latest
 
 ADD ./mock_detector /app
 ENV PYTHONPATH "${PYTHONPATH}:/app:/usr/local/lib/python3.7/site-packages:/learning_loop_node/learning_loop_node"

diff --git a/mock_trainer.dockerfile b/mock_trainer.dockerfile
@@ -1,27 +1,4 @@
-FROM zauberzeug/nicegui:1.2.13
-
-RUN apt-get update && \
-    apt-get install -y jpeginfo \
-    python3-pip \
-    libjpeg-dev \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /app/
-
-RUN python3 -m pip install --upgrade pip
-
-# Install system packages required by Pillow
-# TODO upgrade to pillow >=10 in pyproject.toml
-RUN apt-get update && \
-    apt-get install -y \
-    libjpeg-dev\
-    && rm -rf /var/lib/apt/lists/*
-
-RUN python3 -m pip install --no-cache-dir "uvicorn[standard]"  tqdm async_generator aiofiles retry debugpy pytest-asyncio psutil icecream pytest "pytest-mock==3.6.1" autopep8 pynvml 
-RUN python3 -m pip install --no-cache-dir "learning-loop-node==0.7.53rc2"
-
-# while development this will be mounted but in deployment we need the latest code baked into the image
-ADD ./learning_loop_node /usr/local/lib/python3.11/site-packages/learning_loop_node
+FROM base_node:latest
 
 ADD ./mock_trainer /app
 ENV PYTHONPATH "${PYTHONPATH}:/app:/usr/local/lib/python3.11/site-packages"