Merge pull request #282 from strongjz/python-dev

add dev python 3.10 image

README.md

@@ -37,7 +37,7 @@
 | [php](./images/php) | `cgr.dev/chainguard/php` | stable | [![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/php.build.status.latest-dev.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/php:latest-dev)<br/>[![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/php.build.status.latest-fpm.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/php:latest-fpm)<br/>[![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/php.build.status.latest.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/php:latest) |
 | [postgres](./images/postgres) | `cgr.dev/chainguard/postgres` | stable | [![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/postgres.build.status.latest.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/postgres:latest) |
 | [prometheus](./images/prometheus) | `cgr.dev/chainguard/prometheus` | stable | [![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/prometheus.build.status.latest.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/prometheus:latest) |
-| [python](./images/python) | `cgr.dev/chainguard/python` | stable | [![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/python.build.status.3.10.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/python:3.10)<br/>[![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/python.build.status.latest-dev.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/python:latest-dev)<br/>[![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/python.build.status.latest.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/python:latest) |
+| [python](./images/python) | `cgr.dev/chainguard/python` | stable | [![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/python.build.status.3.10-dev.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/python:3.10-dev)<br/>[![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/python.build.status.3.10.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/python:3.10)<br/>[![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/python.build.status.latest-dev.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/python:latest-dev)<br/>[![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/python.build.status.latest.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/python:latest) |
 | [rabbitmq](./images/rabbitmq) | `cgr.dev/chainguard/rabbitmq` | experimental | [![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/rabbitmq.build.status.latest.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/rabbitmq:latest) |
 | [redis](./images/redis) | `cgr.dev/chainguard/redis` | stable | [![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/redis.build.status.latest.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/redis:latest) |
 | [ruby](./images/ruby) | `cgr.dev/chainguard/ruby` | stable | [![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/ruby.build.status.3.0.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/ruby:3.0)<br/>[![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/ruby.build.status.3.1.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/ruby:3.1)<br/>[![](https://storage.googleapis.com/chainguard-images-build-outputs/badges/ruby.build.status.latest.svg)](https://registry-ui.chainguard.app/?image=cgr.dev/chainguard/ruby:latest) |

images/python/configs/3.10-dev.apko.yaml

@@ -0,0 +1,29 @@
+contents:
+  keyring:
+    - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
+  repositories:
+    - https://packages.wolfi.dev/os
+  packages:
+    - ca-certificates-bundle
+    - python-3.10
+    - wolfi-baselayout
+    - py3.10-pip
+    - apk-tools
+    - bash
+
+entrypoint:
+  command: /usr/bin/python
+
+accounts:
+  groups:
+    - groupname: nonroot
+      gid: 65532
+  users:
+    - username: nonroot
+      uid: 65532
+      gid: 65532
+  run-as: 65532
+
+archs:
+- x86_64
+- aarch64

images/python/configs/3.10.apko.yaml

@@ -8,6 +8,9 @@ contents:
     - python-3.10
     - wolfi-baselayout
 
+entrypoint:
+  command: /usr/bin/python
+
 accounts:
   groups:
     - groupname: nonroot

images/python/configs/latest-dev.apko.yaml

@@ -5,11 +5,16 @@ contents:
     - https://packages.wolfi.dev/os
   packages:
     - ca-certificates-bundle
-    - python3
-    - py3-pip
+    - python-3.11
+    - py3.11-pip
+    - apk-tools
+    - bash
     - wolfi-baselayout
     - busybox
 
+entrypoint:
+  command: /usr/bin/python
+
 accounts:
   groups:
     - groupname: nonroot

images/python/configs/latest.apko.yaml

@@ -5,9 +5,13 @@ contents:
     - https://packages.wolfi.dev/os
   packages:
     - ca-certificates-bundle
-    - python3
+    - python-3.11
     - wolfi-baselayout
 
+
+entrypoint:
+  command: /usr/bin/python
+
 accounts:
   groups:
     - groupname: nonroot

images/python/image.yaml

@@ -5,6 +5,13 @@ versions:
         exclude:
           - 3
       config: configs/3.10.apko.yaml
+  - apko:
+      extractTagsFrom:
+        package: python-3.10
+        prefix: dev-
+        exclude:
+          - 3
+      config: configs/3.10-dev.apko.yaml
   - apko:
       extractTagsFrom:
         package: python-3.11

images/python/tests/01-version.sh

@@ -5,9 +5,9 @@ set -o errexit -o nounset -o errtrace -o pipefail -x
 IMAGE_DIR="$(basename "$(cd "$(dirname ${BASH_SOURCE[0]})/.." && pwd )")"
 IMAGE_NAME=${IMAGE_NAME:-"cgr.dev/chainguard/${IMAGE_DIR}:latest"}
 
-docker run --rm "${IMAGE_NAME}" python --version
+docker run --rm "${IMAGE_NAME}" --version
 
 # Dev variants should have pip
 if [[ "${IMAGE_NAME}" = *-dev ]]; then
-    docker run --rm "${IMAGE_NAME}" pip --version
+    docker run --rm --entrypoint /usr/bin/pip "${IMAGE_NAME}" --version
 fi