From f57d7bf5ad133fb2c4f7b680d6f2dc92718232f8 Mon Sep 17 00:00:00 2001 From: Debanjum Singh Solanky Date: Sat, 18 Feb 2023 23:59:03 -0600 Subject: [PATCH] Use pypi khoj to fix docker builds and dockerize github workflow - Instead of building the package locally like before The issue started since moving to dynamic git based versioning with hatch-vcs This should reduce image size of docker builds too - Also move to ubuntu image since pyqt6 builds available on it, so do not need to build it locally for image - This s --- .dockerignore | 1 + Dockerfile | 13 +++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.dockerignore b/.dockerignore index 2c5ea300..8802acb5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,4 +6,5 @@ docs/ tests/ build/ dist/ +scripts/ *.egg-info/ diff --git a/Dockerfile b/Dockerfile index f40471ec..85ab985e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,14 @@ # syntax=docker/dockerfile:1 -FROM python:3.10-slim-bullseye +FROM ubuntu:kinetic LABEL org.opencontainers.image.source https://github.com/debanjum/khoj # Install System Dependencies -RUN apt-get update -y && \ - apt-get -y install python3-pyqt5 - -# Copy Application to Container -COPY . /app -WORKDIR /app +RUN apt update -y && \ + apt -y install python3-pip python3-pyqt6 # Install Python Dependencies -RUN pip install --upgrade pip && pip install --upgrade ".[dev]" +RUN pip install --upgrade pip && \ + pip install --upgrade --pre khoj-assistant # Run the Application # There are more arguments required for the application to run,