From a8317718238e0151883b19597526d2af3d567b82 Mon Sep 17 00:00:00 2001 From: Pavel Mosein Date: Tue, 1 Apr 2025 20:55:45 +0300 Subject: [PATCH 1/3] Add uv --- uv/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 uv/Dockerfile diff --git a/uv/Dockerfile b/uv/Dockerfile new file mode 100644 index 0000000..1fe9164 --- /dev/null +++ b/uv/Dockerfile @@ -0,0 +1,6 @@ +FROM ghcr.io/snakepacker/python/3.12 +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + +WORKDIR /app + +ENTRYPOINT ["uv"] From 9953209e06d8cbd5390f21eb6d290eee570ee9ac Mon Sep 17 00:00:00 2001 From: Pavel Mosein Date: Tue, 1 Apr 2025 20:57:52 +0300 Subject: [PATCH 2/3] Add uv docs --- .github/workflows/docker-image.yml | 10 +++----- README.md | 40 ++++++++++++++++-------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 0f01cc0..77b4103 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -2,17 +2,15 @@ name: Docker Image CI on: push: - branches: [ master ] + branches: [master] pull_request: - branches: [ master ] + branches: [master] schedule: - cron: "0 18 * * FRI" - cron: "0 18 * * WED" jobs: - base: - runs-on: ubuntu-latest strategy: @@ -114,7 +112,6 @@ jobs: shm-size: 4G tags: ghcr.io/snakepacker/python/${{ matrix.image.tag }},ghcr.io/snakepacker/python:${{ matrix.image.tag }},snakepacker/python:${{ matrix.image.tag }} - images-pillow: needs: images runs-on: ubuntu-latest @@ -172,7 +169,6 @@ jobs: shm-size: 4G tags: ghcr.io/snakepacker/python/${{ matrix.image.tag }},ghcr.io/snakepacker/python:${{ matrix.image.tag }},snakepacker/python:${{ matrix.image.tag }} - apps: needs: - images @@ -198,6 +194,8 @@ jobs: tag: gray - context: ruff tag: ruff + - context: uv + tag: uv - context: jupyterlab tag: jupyterlab diff --git a/README.md b/README.md index e246627..351217e 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ This project is available both in the official docker repository and also on the [`ghcr.io/snakepacker/python/black`](https://github.com/orgs/snakepacker/packages/container/package/python%2Fblack) | [`snakepacker/python:black`](https://hub.docker.com/r/snakepacker/python/tags?page=1&name=black) [`ghcr.io/snakepacker/python/gray`](https://github.com/orgs/snakepacker/packages/container/package/python%2Fgray) | [`snakepacker/python:gray`](https://hub.docker.com/r/snakepacker/python/tags?page=1&name=gray) [`ghcr.io/snakepacker/python/ruff`](https://github.com/orgs/snakepacker/packages/container/package/python%2Fruff) | [`snakepacker/python:ruff`](https://hub.docker.com/r/snakepacker/python/tags?page=1&name=ruff) +[`ghcr.io/snakepacker/python/uv`](https://github.com/orgs/snakepacker/packages/container/package/python%2Fuv) | [`snakepacker/python:uv`](https://hub.docker.com/r/snakepacker/python/tags?page=1&name=uv) [`ghcr.io/snakepacker/python/jupyterlab`](https://github.com/orgs/snakepacker/packages/container/package/python%2Fjupyterlab) | [`snakepacker/python:jupyterlab`](https://hub.docker.com/r/snakepacker/python/tags?page=1&name=jupyterlab) [`ghcr.io/snakepacker/python/base`](https://github.com/orgs/snakepacker/packages/container/package/python%2Fbase) | [`snakepacker/python:base`](https://hub.docker.com/r/snakepacker/python/tags?page=1&name=base) @@ -68,6 +69,7 @@ all-pillow | ![](https://flat.badgen.net/docker/size/snakepacker/python/all-pill [black](https://black.readthedocs.io/en/stable/) | ![](https://flat.badgen.net/docker/size/snakepacker/python/black/amd64?label=size) | ready to use | black application image (useful for CI) [gray](https://github.com/dizballanze/gray) | ![](https://flat.badgen.net/docker/size/snakepacker/python/gray/amd64?label=size) | ready to use | gray application image (useful for CI) [ruff](https://github.com/astral-sh/ruff) | ![](https://flat.badgen.net/docker/size/snakepacker/python/ruff/amd64?label=size) | ready to use | ruff linter image (useful for CI) +[uv](https://github.com/astral-sh/uv) | ![](https://flat.badgen.net/docker/size/snakepacker/python/uv/amd64?label=size) | ready to use | An extremely fast Python package and project manager (useful for CI) [jupyterlab](https://github.com/jupyterlab/jupyterlab) | ![](https://flat.badgen.net/docker/size/snakepacker/python/jupyterlab/amd64?label=size) | ready to use | jupyterlab image base | ![](https://flat.badgen.net/docker/size/snakepacker/python/base/amd64?label=size) | | common layers @@ -75,45 +77,45 @@ base | ![](https://flat.badgen.net/docker/size/snakepacker/python/base/amd64 Concept ------- -The main idea of this method is to build a `virtualenv` for your package using -heavy full-powered image (e.g. `ghcr.io/snakepacker/python:all`, that contains all -necessary headers, libraries, compiler, etc.), and then copy it into thin +The main idea of this method is to build a `virtualenv` for your package using +heavy full-powered image (e.g. `ghcr.io/snakepacker/python:all`, that contains all +necessary headers, libraries, compiler, etc.), and then copy it into thin `base image` with suitable Python version. Reasons ------- -Why so complex? You could just `COPY` directory with your python project into -Docker container, and for the first point of view this seems to be reasonable. +Why so complex? You could just `COPY` directory with your python project into +Docker container, and for the first point of view this seems to be reasonable. But just copying directory with python project cause several problems: -- Generated on different operating system .pyc files can be put into Docker - image accidentally. Thus, python would try to rewrite .pyc with correct ones - each time when Docker image would be started. If you would run Docker image - in read-only mode - your application would break. - -- Large possibility that you would also pack garbage files: pytest and tox - cache, developer's virtualenv and other files, that just increate the size of +- Generated on different operating system .pyc files can be put into Docker + image accidentally. Thus, python would try to rewrite .pyc with correct ones + each time when Docker image would be started. If you would run Docker image + in read-only mode - your application would break. + +- Large possibility that you would also pack garbage files: pytest and tox + cache, developer's virtualenv and other files, that just increate the size of the resulting image. -- No explicit entrypoint. It is not obvious what commands end user is able to +- No explicit entrypoint. It is not obvious what commands end user is able to run (we hope you've implemented `-h` or `--help` arguments). - -- By default, tox interprets your package as python module, e.g. it tries to + +- By default, tox interprets your package as python module, e.g. it tries to run `pip install .` when preparing environment. Yes, of course, you can solve all of those problems using hacks, specific -settings, .dockeridnore file, and other tricks. But it would be non-intuitive +settings, .dockeridnore file, and other tricks. But it would be non-intuitive and non-obvious for your users. -So, we recommend to spend a little more time and pack your package carefully, +So, we recommend to spend a little more time and pack your package carefully, so your users would run it with pleasure. Example ------- -For example, you may build the `jupyter notebook`. Just create a Dockerfile +For example, you may build the `jupyter notebook`. Just create a Dockerfile with the following content: ```Dockerfile @@ -168,7 +170,7 @@ All images contain ready to use and simple wrappers for easy image building. Pretty simple bash script. The main purpose is removing the apt cache and temporary files after installation when you want to install something through apt-get install. -Otherwise, you have to write something like this +Otherwise, you have to write something like this ```bash apt-get update && \ From 047d1c50beb372b5e6b7d53c46d6d88c6a92d201 Mon Sep 17 00:00:00 2001 From: Pavel Mosein Date: Tue, 1 Apr 2025 21:05:32 +0300 Subject: [PATCH 3/3] try to fix login --- .github/workflows/docker-image.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 77b4103..a701116 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -31,14 +31,14 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.CR_PAT }} - name: Login to hub.docker.io Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: mosquito password: ${{ secrets.DH_TOKEN }} @@ -89,14 +89,14 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.CR_PAT }} - name: Login to hub.docker.io Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: mosquito password: ${{ secrets.DH_TOKEN }} @@ -146,14 +146,14 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.CR_PAT }} - name: Login to hub.docker.io Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: mosquito password: ${{ secrets.DH_TOKEN }} @@ -209,14 +209,14 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.CR_PAT }} - name: Login to hub.docker.io Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: mosquito password: ${{ secrets.DH_TOKEN }}