Merge remote-tracking branch 'origin/build/docker/multiplatform'

# Conflicts:
#	poetry.lock

.dockerignore

@@ -0,0 +1,5 @@
+.fleet
+.git
+config_examples
+.github
+Dockerfile

.github/workflows/build_dev.yaml

@@ -28,11 +28,16 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64, linux/arm64
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:test
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,34 +1,27 @@
-FROM python:3.9.16-slim AS python
+FROM python:3 AS python
+ENV PYTHONUNBUFFERED=true
 ENV PATH=$PATH:/root/.local/bin
 WORKDIR /app
 
+FROM python AS build
 RUN apt-get update && \
     apt-get install -y \
     curl \
     libpq-dev \
     gcc \
     unixodbc \
-    unixodbc-dev
-
-RUN curl -s -o microsoft.asc https://packages.microsoft.com/keys/microsoft.asc \
-    && curl -s -o mssql-release.list https://packages.microsoft.com/config/debian/10/prod.list \
-    && apt-get install -y g++
-
-RUN curl -s -o microsoft.asc https://packages.microsoft.com/keys/microsoft.asc \
-    && curl -s -o mssql-release.list https://packages.microsoft.com/config/debian/10/prod.list \
-    && apt-get install -y g++
-
-RUN curl -sSL https://install.python-poetry.org | python3 -
-
-FROM python AS build
+    unixodbc-dev \
+    g++ \
+    python-dev \
+    python3-dev
 
 # For pyodbc
 ENV ACCEPT_EULA=Y
 RUN apt-get install -y gnupg2
 
 RUN curl -s -o microsoft.asc https://packages.microsoft.com/keys/microsoft.asc \
     && curl -s -o mssql-release.list https://packages.microsoft.com/config/debian/10/prod.list \
-    && apt-get install -y g++ unixodbc-dev
+    && apt-get install -y g++
 
 RUN apt-key add microsoft.asc && rm microsoft.asc && mv mssql-release.list /etc/apt/sources.list.d/mssql-release.list
 RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
@@ -38,16 +31,19 @@ RUN apt-get install -y msodbcsql18
 RUN apt-get install -y mssql-tools18
 RUN echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc
 
-COPY poetry.lock pyproject.toml ./
 
-RUN poetry config virtualenvs.create false
-RUN poetry install --no-root --no-dev -vvv
+RUN curl -sSL https://install.python-poetry.org | python3 -
+ENV POETRY_VIRTUALENVS_IN_PROJECT=true
+COPY . .
+
+RUN pip install --upgrade pip
+RUN poetry install --no-interaction --only main
 
-COPY odd_collector_profiler ./odd_collector_profiler
-COPY collector_config.yaml ./
 
+FROM python as runtime
 RUN useradd --create-home --shell /bin/bash app
 USER app
-COPY start.sh ./start.sh
+COPY --from=build /app /app
 
+ENV PATH="/app/.venv/bin:$PATH"
 ENTRYPOINT ["/bin/bash", "start.sh"]

odd_collector_profiler/domain/collector_profiler_config.py

@@ -1,11 +1,11 @@
-from typing import Any, List
+from typing import Any, List, Optional
 
 from pyaml_env import parse_config
 from pydantic import BaseSettings
 
 
 class CollectorProfilerConfig(BaseSettings):
-    default_pulling_interval: int
+    default_pulling_interval: Optional[int] = None
     token: str
     profilers: List[Any]
     platform_host_url: str