From 4e4db3f113d9530f6d6729c8bde3574cc56dffb4 Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Wed, 26 Jun 2024 21:08:37 +0000 Subject: [PATCH] Remove more dependencies. --- Dockerfile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 67e44ce1..d2c3c0f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,14 +11,11 @@ RUN apt-get update && apt-get install --no-install-recommends -y -q \ curl \ gcc \ git \ - libcairo2-dev \ libev-dev \ jq \ python3 \ python3-dev \ python3-pip \ - python3-pyqt5 \ - python3-pyqt5.sip && \ curl -sSL https://install.python-poetry.org | python3 - --version "$(jq -r .constraints.poetry /root/renovate.json)" && \ poetry config virtualenvs.create false && \ python3 -m pip install --no-cache-dir --upgrade pip @@ -34,8 +31,7 @@ COPY poetry.lock pyproject.toml README.md /gamutrf/ # dependency install is cached for faster rebuild, if only gamutrf source changed. RUN if [ "${POETRY_CACHE}" != "" ] ; then echo using cache "${POETRY_CACHE}" ; poetry source add --priority=default local "${POETRY_CACHE}" ; fi # TODO: handle caching -RUN for i in bjoern falcon-cors gpsd-py3 RPi.GPIO pycairo ; do poetry run pip install --no-cache-dir "$i"=="$(grep $i pyproject.toml | grep -Eo '\"[0-9\.]+' | sed 's/\"//g')" || exit 1 ; done -RUN if [ "$(arch)" == "aarch64" ] ; then poetry run pip install --no-cache-dir RPi.GPIO=="$(grep RPi.GPIO pyproject.toml | grep -Eo '\"[0-9\.]+' | sed 's/\"//g')" ; fi +RUN for i in bjoern falcon-cors gpsd-py3 ; do poetry run pip install --no-cache-dir "$i"=="$(grep $i pyproject.toml | grep -Eo '\"[0-9\.]+' | sed 's/\"//g')" || exit 1 ; done RUN poetry install --no-interaction --no-ansi --no-dev --no-root COPY gamutrf gamutrf/ COPY bin bin/ @@ -61,7 +57,6 @@ RUN if [ "$(arch)" = "x86_64" ] ; then /root/install-nv.sh ; fi && \ libboost-iostreams1.74.0 \ libboost-program-options1.74.0 \ libboost-thread1.74.0 \ - libcairo2 \ libev4 \ libfftw3-3 \ libgl1 \ @@ -70,8 +65,6 @@ RUN if [ "$(arch)" = "x86_64" ] ; then /root/install-nv.sh ; fi && \ libopencv-core4.5d \ libopencv-imgcodecs4.5d \ libopencv-imgproc4.5d \ - python3-pyqt5 \ - python3-pyqt5.sip \ librtlsdr0 \ libspdlog1 \ libuhd4.1.0 \