From e1cf9c6b67064bcadc9e7f5aed264c2d22cc621c Mon Sep 17 00:00:00 2001 From: Xiaoyu Guo Date: Wed, 13 Aug 2025 16:40:46 +0800 Subject: [PATCH 1/2] chore: add poetry 2.1.4 --- .github/workflows/docker-publish.yml | 6 +++--- .pre-commit-config.yaml | 4 ++-- README.md | 20 ++++++++++---------- scripts/update_workflow.py | 4 ++-- versions.json | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index b4b1f1e..b01c95b 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -24,11 +24,11 @@ jobs: strategy: matrix: python_version: ["3.12-bullseye", "3.12-slim", "3.11-slim", "3.10-bullseye", "3.10-slim"] - poetry_version: ["2.1.3", "2.0.1", "1.8.5", "1.7.1"] + poetry_version: ["2.1.4", "2.0.1", "1.8.5", "1.7.1"] include: - - poetry_version: "2.1.3" + - poetry_version: "2.1.4" python_version: "3.13-bookworm" - - poetry_version: "2.1.3" + - poetry_version: "2.1.4" python_version: "3.13-slim" - poetry_version: "2.0.1" python_version: "3.13-bookworm" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9c7563f..a0501f4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 + rev: v6.0.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -19,7 +19,7 @@ repos: - id: destroyed-symlinks - id: forbid-submodules - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.9.9 + rev: v0.12.8 hooks: - id: ruff args: [ --fix ] diff --git a/README.md b/README.md index 9625b35..e320f52 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ # poetry-docker -[![2.1.3-py3.13-bookworm badge](https://img.shields.io/docker/v/biggates/poetry/2.1.3-py3.13-bookworm?label=biggates%2Fpoetry&logo=docker) ![2.1.3-py3.13-slim badge](https://img.shields.io/docker/v/biggates/poetry/2.1.3-py3.13-slim?label=biggates%2Fpoetry&logo=docker) ![2.1.3-py3.12-bullseye badge](https://img.shields.io/docker/v/biggates/poetry/2.1.3-py3.12-bullseye?label=biggates%2Fpoetry&logo=docker) ![2.1.3-py3.12-slim badge](https://img.shields.io/docker/v/biggates/poetry/2.1.3-py3.12-slim?label=biggates%2Fpoetry&logo=docker) ![2.1.3-py3.11-slim badge](https://img.shields.io/docker/v/biggates/poetry/2.1.3-py3.11-slim?label=biggates%2Fpoetry&logo=docker) ![2.1.3-py3.10-bullseye badge](https://img.shields.io/docker/v/biggates/poetry/2.1.3-py3.10-bullseye?label=biggates%2Fpoetry&logo=docker) ![2.1.3-py3.10-slim badge](https://img.shields.io/docker/v/biggates/poetry/2.1.3-py3.10-slim?label=biggates%2Fpoetry&logo=docker)](https://hub.docker.com/r/biggates/poetry) [![Docker Publish Badge](https://github.com/biggates/poetry-docker/actions/workflows/docker-publish.yml/badge.svg?branch=master)](https://github.com/biggates/poetry-docker/actions/workflows/docker-publish.yml) +[![2.1.4-py3.12-bullseye badge](https://img.shields.io/docker/v/biggates/poetry/2.1.4-py3.12-bullseye?label=biggates%2Fpoetry&logo=docker) ![2.1.4-py3.12-slim badge](https://img.shields.io/docker/v/biggates/poetry/2.1.4-py3.12-slim?label=biggates%2Fpoetry&logo=docker) ![2.1.4-py3.11-slim badge](https://img.shields.io/docker/v/biggates/poetry/2.1.4-py3.11-slim?label=biggates%2Fpoetry&logo=docker) ![2.1.4-py3.10-bullseye badge](https://img.shields.io/docker/v/biggates/poetry/2.1.4-py3.10-bullseye?label=biggates%2Fpoetry&logo=docker) ![2.1.4-py3.10-slim badge](https://img.shields.io/docker/v/biggates/poetry/2.1.4-py3.10-slim?label=biggates%2Fpoetry&logo=docker)](https://hub.docker.com/r/biggates/poetry) [![Docker Publish Badge](https://github.com/biggates/poetry-docker/actions/workflows/docker-publish.yml/badge.svg?branch=master)](https://github.com/biggates/poetry-docker/actions/workflows/docker-publish.yml) a Docker image that includes [Poetry](https://python-poetry.org/) for CI/CD pipelines. ## Supported tags -- `2.1.3-py3.13-bookworm` -- `2.1.3-py3.13-slim` -- `2.1.3-py3.12-bullseye` -- `2.1.3-py3.12-slim` -- `2.1.3-py3.11-slim` -- `2.1.3-py3.10-bullseye` -- `2.1.3-py3.10-slim` +- `2.1.4-py3.13-bookworm` +- `2.1.4-py3.13-slim` +- `2.1.4-py3.12-bullseye` +- `2.1.4-py3.12-slim` +- `2.1.4-py3.11-slim` +- `2.1.4-py3.10-bullseye` +- `2.1.4-py3.10-slim` See [versions.json](./versions.json) for further information. @@ -22,7 +22,7 @@ In your pipeline / actions, replace docker image from `python` to `biggates/poet ```dockerfile # FROM python:3.10-slim -FROM biggates/poetry:2.1.3-py3.10-slim +FROM biggates/poetry:2.1.4-py3.10-slim ``` ## details @@ -39,7 +39,7 @@ A typical usage is use poetry to install all the dependencies in one stage, and ```dockerfile # first stage -FROM biggates/poetry:2.1.3-py3.10-slim as venv-creator +FROM biggates/poetry:2.1.4-py3.10-slim as venv-creator ENV POETRY_NO_INTERACTION=1 \ POETRY_VIRTUALENVS_IN_PROJECT=1 \ diff --git a/scripts/update_workflow.py b/scripts/update_workflow.py index 5276d34..a134546 100755 --- a/scripts/update_workflow.py +++ b/scripts/update_workflow.py @@ -72,9 +72,9 @@ python_version: $python_versions poetry_version: $poetry_versions include: - - poetry_version: "2.1.3" + - poetry_version: "2.1.4" python_version: "3.13-bookworm" - - poetry_version: "2.1.3" + - poetry_version: "2.1.4" python_version: "3.13-slim" - poetry_version: "2.0.1" python_version: "3.13-bookworm" diff --git a/versions.json b/versions.json index 73f3f0c..1650b6e 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,6 @@ { "poetry": [ - "2.1.3", + "2.1.4", "2.0.1", "1.8.5", "1.7.1" From 6e0341f903fd1fa84e44d33a66bd724ea7c6664b Mon Sep 17 00:00:00 2001 From: Xiaoyu Guo Date: Wed, 13 Aug 2025 17:14:24 +0800 Subject: [PATCH 2/2] fix(ci): remove an action --- .github/workflows/docker-publish.yml | 2 +- .github/workflows/update-versions.yml | 30 --------------------------- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 .github/workflows/update-versions.yml diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index b01c95b..8142350 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -42,7 +42,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Docker buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/update-versions.yml b/.github/workflows/update-versions.yml deleted file mode 100644 index 5651092..0000000 --- a/.github/workflows/update-versions.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -name: update workflow from versions - -on: - push: - branches: [ "develop" ] - paths: - - versions.json - workflow_dispatch: - -jobs: - update: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - token: ${{ secrets.GIT_WORKFLOW_TOKEN }} - - uses: fregante/setup-git-user@v2 - - name: Setup python - uses: actions/setup-python@v5 - with: - python-version: '3.10' - - name: Update docker-publish workflow - run: ./scripts/update_workflow.py - - name: Push updates - run: | - git add . - git diff-index --quiet HEAD || git commit -m "actions: update docker-publish workflow" - git push