revert Dockerfile to working version, add Dockerfile.pico for multi-stage build testing

Author: LazyFP Dev

.github/workflows/docker.yml

@@ -56,3 +56,51 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+
+  build-and-push-pico:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: |
+            suffix=-pico
+          tags: |
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=sha
+
+      - name: Build and push pico Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile.pico
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

Dockerfile

@@ -1,41 +1,17 @@
-FROM python:3.11-slim AS builder
+FROM python:3.11-slim
 
 ENV PYTHONDONTWRITEBYTECODE=1 \
     PYTHONUNBUFFERED=1
 
-WORKDIR /build
+WORKDIR /app
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    libmagic1 \
-    gcc \
-    && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends libmagic1 && rm -rf /var/lib/apt/lists/*
 
 COPY requirements.txt .
-RUN sed -i 's/\\$//; s/--hash=.*$//' requirements.txt && \
-    grep -v '^$\|^#\|via ' requirements.txt > clean-requirements.txt && \
-    pip install --no-cache-dir --prefix=/install -r clean-requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
 
 COPY . .
-RUN pip install --no-cache-dir --prefix=/install .
-
-FROM python:3.11-slim
-
-ENV PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONUNBUFFERED=1 \
-    PATH="/install/bin:$PATH" \
-    PYTHONPATH="/install/lib/python3.11/site-packages"
-
-WORKDIR /app
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    libmagic1 \
-    && rm -rf /var/lib/apt/lists/*
-
-COPY --from=builder /install /install
-COPY --from=builder /build/app.py /build/main.py /build/config/ /app/
-COPY --from=builder /build/extractors/ /app/extractors/
-COPY --from=builder /build/core/ /app/core/
-COPY --from=builder /build/static/ /app/static/
+RUN pip install --no-cache-dir .
 
 RUN mkdir -p fp/dump fp/organized
 

Dockerfile.pico

@@ -0,0 +1,47 @@
+FROM python:3.11-slim AS builder
+
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1
+
+WORKDIR /build
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libmagic1 \
+    gcc \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY requirements.txt .
+RUN sed -i 's/\\$//; s/--hash=.*$//' requirements.txt && \
+    grep -v '^$\|^#\|via ' requirements.txt > clean-requirements.txt && \
+    pip install --no-cache-dir --prefix=/install -r clean-requirements.txt
+
+COPY . .
+RUN pip install --no-cache-dir --prefix=/install .
+
+FROM python:3.11-slim
+
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    PATH="/install/bin:$PATH" \
+    PYTHONPATH="/install/lib/python3.11/site-packages"
+
+WORKDIR /app
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libmagic1 \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder /install /install
+COPY --from=builder /build/app.py /build/main.py /build/config/ /app/
+COPY --from=builder /build/extractors/ /app/extractors/
+COPY --from=builder /build/core/ /app/core/
+COPY --from=builder /build/static/ /app/static/
+
+RUN mkdir -p fp/dump fp/organized
+
+EXPOSE 8000
+
+HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
+    CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:8000/')" || exit 1
+
+CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "8000"]