Skip to content

Commit

Permalink
Bump PDM to 1.12.6.
Browse files Browse the repository at this point in the history
  • Loading branch information
mnako committed Jan 18, 2022
1 parent 8171f2c commit 17e551f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion {{ cookiecutter.project_name }}/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN groupadd --force --gid ${GROUP_ID} --system usergroup && \
USER user

WORKDIR /app
RUN python -m pip install --upgrade pip==21.3.1 && pip install --user pdm==1.12.2
RUN python -m pip install --upgrade pip==21.3.1 && pip install --user pdm==1.12.6
ENV PATH="/app/__pypackages__/3.10/bin:/home/user/.local/bin:${PATH}"

COPY main.py pdm.lock pyproject.toml /app/
Expand Down
2 changes: 1 addition & 1 deletion {{ cookiecutter.project_name }}/Dockerfile.production
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN addgroup -S usergroup && adduser -S user -G usergroup && mkdir /app && chown
USER user

WORKDIR /app
RUN python -m pip install --upgrade pip==21.3.1 && pip install --user pdm==1.12.2
RUN python -m pip install --upgrade pip==21.3.1 && pip install --user pdm==1.12.6
ENV PATH="/app/__pypackages__/3.10/bin:/home/user/.local/bin:${PATH}"

COPY main.py pdm.lock pyproject.toml /app/
Expand Down
4 changes: 2 additions & 2 deletions {{ cookiecutter.project_name }}/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ USER_ID := $(shell id -u)
GROUP_ID := $(shell id -g)

dev-env:
if [ "$(shell docker image inspect --format='exists' {{ cookiecutter.project_name }}:dev)" != "exists" ]; then docker build --build-arg USER_ID=${USER_ID} --build-arg GROUP_ID=${GROUP_ID} --tag {{ cookiecutter.project_name }}:dev .; fi;
if [ ! -d "__pypackages__" ]; then docker run -t -v "$(PWD):/app" {{ cookiecutter.project_name }}:dev pdm install; docker run -t -v "$(PWD):/app" {{ cookiecutter.project_name }}:dev pdm install --group dev; fi;
@if [ "$(shell docker image inspect --format='exists' {{ cookiecutter.project_name }}:dev)" != "exists" ]; then docker build --build-arg USER_ID=${USER_ID} --build-arg GROUP_ID=${GROUP_ID} --tag {{ cookiecutter.project_name }}:dev .; fi;
@if [ ! -d "__pypackages__" ]; then docker run -t -v "$(PWD):/app" {{ cookiecutter.project_name }}:dev pdm install; docker run -t -v "$(PWD):/app" {{ cookiecutter.project_name }}:dev pdm install --group dev; fi;

run: dev-env
docker run --rm -v "$(PWD):/app" {{ cookiecutter.project_name }}:dev
Expand Down

0 comments on commit 17e551f

Please sign in to comment.