Skip to content

Commit

Permalink
poetry dev args.
Browse files Browse the repository at this point in the history
  • Loading branch information
anarkiwi committed Apr 1, 2024
1 parent d33dc92 commit 01e4d77
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ COPY bin/pipcacheconfig.sh /root/pipcacheconfig.sh
COPY gamutrflib /gamutrflib/
WORKDIR /gamutrflib
RUN if [ "${POETRY_CACHE}" != "" ] ; then /root/pipcacheconfig.sh echo using cache "${POETRY_CACHE}" ; poetry source add --priority=default local "${POETRY_CACHE}" ; fi
RUN poetry install --no-interaction --no-ansi --no-dev
RUN poetry install --no-interaction --no-ansi --without dev
WORKDIR /gamutrf
RUN python3 -c "from gamutrflib.zmqbucket import *"
COPY poetry.lock pyproject.toml README.md /gamutrf/
Expand All @@ -36,11 +36,11 @@ RUN if [ "${POETRY_CACHE}" != "" ] ; then echo using cache "${POETRY_CACHE}" ; p
# 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 poetry install --no-interaction --no-ansi --no-dev --no-root
RUN poetry install --no-interaction --no-ansi --without dev --no-root
COPY gamutrf gamutrf/
COPY bin bin/
COPY templates templates/
RUN poetry install --no-interaction --no-ansi --no-dev
RUN poetry install --no-interaction --no-ansi --without dev

# nosemgrep:github.workflows.config.dockerfile-source-not-pinned
FROM ubuntu:22.04
Expand Down Expand Up @@ -92,7 +92,7 @@ COPY --from=installer /gamutrflib /gamutrflib
COPY --from=installer /root/.local /root/.local
RUN ldconfig -v
WORKDIR /gamutrflib
RUN poetry install --no-interaction --no-ansi --no-dev
RUN poetry install --no-interaction --no-ansi
WORKDIR /gamutrf
RUN python3 -c "from gamutrflib.zmqbucket import *"
RUN echo "$(find /gamutrf/gamutrf -type f -name \*py -print)"|xargs grep -Eh "^(import|from)\s"|grep -Ev "gamutrf"|sort|uniq|python3
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.waterfall
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ COPY gamutrfwaterfall /gamutrfwaterfall/
# TODO: handle caching for pycairo
RUN poetry run pip install --no-cache-dir pycairo=="$(grep pycairo pyproject.toml | grep -Eo '[0-9\.]+')"
RUN if [ "${POETRY_CACHE}" != "" ] ; then echo using cache "${POETRY_CACHE}" ; poetry source add --priority=default local "${POETRY_CACHE}" ; fi
RUN poetry install --no-interaction --no-ansi --no-dev
RUN poetry install --no-interaction --no-ansi --without dev

FROM ubuntu:22.04
ENV DEBIAN_FRONTEND noninteractive
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ gamutrf-offline= 'gamutrf.__main__:offline'
gamutrf-scan = 'gamutrf.__main__:scan'
gamutrf-sigfinder = 'gamutrf.__main__:sigfinder'
gamutrf-specgram = 'gamutrf.__main__:specgram'
gamutrf-waterfall = 'gamutrf.__main__:waterfall'
gamutrf-worker = 'gamutrf.__main__:worker'

[tool.poetry.urls]
Expand Down

0 comments on commit 01e4d77

Please sign in to comment.