diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index fb18fd5..9512119 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -11,7 +11,6 @@ on: env: PIPX_VERSION: "0.16.4" POETRY_VERSION: "1.1.11" - POETRY_VIRTUALENVS_IN_PROJECT: true jobs: python: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index a255011..a9774b5 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -12,7 +12,6 @@ on: env: PIPX_VERSION: "0.16.4" POETRY_VERSION: "1.1.11" - POETRY_VIRTUALENVS_IN_PROJECT: true jobs: analyze: diff --git a/.github/workflows/hooks.yml b/.github/workflows/hooks.yml index 1d61a40..c86bfa7 100644 --- a/.github/workflows/hooks.yml +++ b/.github/workflows/hooks.yml @@ -9,7 +9,6 @@ on: env: PIPX_VERSION: "0.16.4" POETRY_VERSION: "1.1.11" - POETRY_VIRTUALENVS_IN_PROJECT: true jobs: pre-commit: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a99f4b2..508fd30 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,6 @@ on: env: PIPX_VERSION: "0.16.4" POETRY_VERSION: "1.1.11" - POETRY_VIRTUALENVS_IN_PROJECT: true jobs: test: diff --git a/Dockerfile b/Dockerfile index bc0aaa6..f9db47c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,8 @@ LABEL org.opencontainers.image.source="https://github.com/br3ndonland/inboard" LABEL org.opencontainers.image.title="inboard" LABEL org.opencontainers.image.url="https://github.com/br3ndonland/inboard/pkgs/container/inboard" ARG LINUX_VERSION PIPX_VERSION=0.16.4 POETRY_VERSION=1.1.11 -ENV APP_MODULE=inboard.app.main_base:app LINUX_VERSION=$LINUX_VERSION PATH=/opt/pipx/bin:/app/.venv/bin:$PATH PIPX_BIN_DIR=/opt/pipx/bin PIPX_HOME=/opt/pipx/home PIPX_VERSION=$PIPX_VERSION POETRY_VERSION=$POETRY_VERSION POETRY_VIRTUALENVS_IN_PROJECT=true PYTHONPATH=/app -COPY poetry.lock pyproject.toml /app/ +ENV APP_MODULE=inboard.app.main_base:app LINUX_VERSION=$LINUX_VERSION PATH=/opt/pipx/bin:/app/.venv/bin:$PATH PIPX_BIN_DIR=/opt/pipx/bin PIPX_HOME=/opt/pipx/home PIPX_VERSION=$PIPX_VERSION POETRY_VERSION=$POETRY_VERSION PYTHONPATH=/app +COPY poetry.lock poetry.toml pyproject.toml /app/ WORKDIR /app RUN sh -c 'if [ "$LINUX_VERSION" = "slim" ]; then apt-get update -qy && apt-get install -qy --no-install-recommends gcc libc-dev make wget; fi' && \ sh -c '. /etc/os-release; if [ "$ID" = "alpine" ]; then apk add --no-cache --virtual .build-deps gcc libc-dev libffi-dev make openssl-dev; fi' && \