-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #384 from camptocamp/poetry-gsgmf-1726
Use Poetry instead of Pipenv
- Loading branch information
Showing
17 changed files
with
1,627 additions
and
986 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
ignored: | ||
- DL3008 # pin version: https://github.com/hadolint/hadolint/wiki/DL3008 | ||
- DL3003 # use workdir: https://github.com/hadolint/hadolint/wiki/DL3003 | ||
- DL3003 # Use WORKDIR to switch to a directory | ||
- DL3008 # Pin versions in apt get install. Instead of `apt-get install <package>` use `apt-get install <package>=<version>` | ||
- DL3042 # Avoid use of cache directory with pip. Use `pip install --no-cache-dir <package>` | ||
- DL3059 # Multiple consecutive `RUN` instructions. Consider consolidation. | ||
- SC1091 # Not following: File not included in mock. | ||
- SC2164 # Use cd ... || exit in case cd fails. |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,41 @@ | ||
FROM python:3.10.5 | ||
FROM python:3.10.5 as base-all | ||
LABEL maintainer "info@camptocamp.org" | ||
|
||
SHELL ["/bin/bash", "-o", "pipefail", "-cux"] | ||
|
||
RUN --mount=type=cache,target=/var/lib/apt/lists \ | ||
--mount=type=cache,target=/var/cache,sharing=locked \ | ||
apt-get update \ | ||
&& apt-get upgrade --assume-yes \ | ||
&& DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes --no-install-recommends python3-pip | ||
|
||
# Used to convert the locked packages by poetry to pip requirements format | ||
# We don't directly use `poetry install` because it force to use a virtual environment. | ||
FROM base-all as poetry | ||
|
||
# Install Poetry | ||
WORKDIR /tmp | ||
COPY requirements.txt ./ | ||
RUN --mount=type=cache,target=/root/.cache \ | ||
python3 -m pip install --disable-pip-version-check --requirement=requirements.txt | ||
|
||
# Do the conversion | ||
COPY poetry.lock pyproject.toml ./ | ||
RUN poetry export --dev --output=requirements-dev.txt | ||
|
||
# Base, the biggest thing is to install the Python packages | ||
FROM base-all | ||
|
||
RUN mkdir -p /tmp/junitxml | ||
|
||
COPY requirements.txt /tmp/ | ||
RUN python3 -m pip install --disable-pip-version-check --no-cache-dir --requirement=/tmp/requirements.txt \ | ||
&& rm --recursive --force /tmp/* | ||
RUN --mount=type=cache,target=/root/.cache \ | ||
--mount=type=bind,from=poetry,source=/tmp,target=/poetry \ | ||
python3 -m pip install --disable-pip-version-check --no-deps --requirement=/poetry/requirements-dev.txt | ||
|
||
WORKDIR /acceptance_tests | ||
|
||
COPY Pipfile Pipfile.lock ./ | ||
RUN pipenv sync --system --clear --dev \ | ||
&& rm --recursive --force /usr/local/lib/python3.*/dist-packages/tests/ /tmp/* /root/.cache/* | ||
|
||
COPY . ./ | ||
|
||
ENV DOCKER_RUN 1 | ||
|
||
CMD ["sleep", "infinity"] | ||
CMD ["tail", "--follow", "/dev/null"] |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.