Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: docker-library/python
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: luislhl/docker-python
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 17 commits
  • 43 files changed
  • 2 contributors

Commits on Jan 16, 2025

  1. cherry-pick: Luiz-Monad@fe752b6

    Luiz-Monad authored and luislhl committed Jan 16, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    1aa3503 View commit details
  2. Empty commit

    luislhl committed Jan 16, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    f707ca2 View commit details
  3. chore: apply templates

    luislhl committed Jan 16, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    df41fe8 View commit details
  4. chore: remove schedule

    luislhl committed Jan 16, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    2152d40 View commit details
  5. ci: try to push images

    luislhl committed Jan 16, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    622a58b View commit details
  6. ci: drop alpine

    luislhl committed Jan 16, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    4a6e33e View commit details
  7. ci: drop alpine

    luislhl committed Jan 16, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    0ffac37 View commit details
  8. ci: fix push images

    luislhl committed Jan 16, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    64180f1 View commit details
  9. ci: fix push images

    luislhl committed Jan 16, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    e728719 View commit details

Commits on Jan 17, 2025

  1. ci: fix push images

    luislhl committed Jan 17, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    48cab57 View commit details
  2. chore: add Travis

    luislhl committed Jan 17, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    b5d64c0 View commit details
  3. fix: python version

    luislhl committed Jan 17, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    20d4ff1 View commit details
  4. ci: add CircleCI

    luislhl committed Jan 17, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    923cdfc View commit details
  5. ci: add CircleCI

    luislhl committed Jan 17, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    ac31ea1 View commit details
  6. chore: add Python 3.10

    luislhl committed Jan 17, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    aac844b View commit details
  7. ci: fix Circle CI config

    luislhl committed Jan 17, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    c4adc8f View commit details
  8. ci: fix Circle CI config

    luislhl committed Jan 17, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    luislhl Luis Helder
    Copy the full SHA
    bd75065 View commit details
Showing with 137 additions and 3,462 deletions.
  1. +34 −0 .circleci/config.yml
  2. +24 −53 .github/workflows/ci.yml
  3. +23 −0 .travis.yml
  4. +0 −140 3.10/alpine3.20/Dockerfile
  5. +0 −140 3.10/alpine3.21/Dockerfile
  6. +0 −112 3.10/bookworm/Dockerfile
  7. +3 −0 3.10/bullseye/Dockerfile
  8. +0 −145 3.10/slim-bookworm/Dockerfile
  9. +9 −1 3.10/slim-bullseye/Dockerfile
  10. +0 −140 3.11/alpine3.20/Dockerfile
  11. +0 −140 3.11/alpine3.21/Dockerfile
  12. +0 −112 3.11/bookworm/Dockerfile
  13. +3 −0 3.11/bullseye/Dockerfile
  14. +0 −145 3.11/slim-bookworm/Dockerfile
  15. +9 −1 3.11/slim-bullseye/Dockerfile
  16. +0 −132 3.12/alpine3.20/Dockerfile
  17. +0 −132 3.12/alpine3.21/Dockerfile
  18. +0 −104 3.12/bookworm/Dockerfile
  19. +3 −0 3.12/bullseye/Dockerfile
  20. +0 −137 3.12/slim-bookworm/Dockerfile
  21. +9 −1 3.12/slim-bullseye/Dockerfile
  22. +0 −65 3.12/windows/windowsservercore-1809/Dockerfile
  23. +0 −65 3.12/windows/windowsservercore-ltsc2022/Dockerfile
  24. +0 −127 3.13/alpine3.20/Dockerfile
  25. +0 −127 3.13/alpine3.21/Dockerfile
  26. +0 −99 3.13/bookworm/Dockerfile
  27. +3 −0 3.13/bullseye/Dockerfile
  28. +0 −132 3.13/slim-bookworm/Dockerfile
  29. +9 −1 3.13/slim-bullseye/Dockerfile
  30. +0 −65 3.13/windows/windowsservercore-1809/Dockerfile
  31. +0 −65 3.13/windows/windowsservercore-ltsc2022/Dockerfile
  32. +0 −92 3.14-rc/bookworm/Dockerfile
  33. +0 −92 3.14-rc/bullseye/Dockerfile
  34. +0 −125 3.14-rc/slim-bookworm/Dockerfile
  35. +0 −125 3.14-rc/slim-bullseye/Dockerfile
  36. +0 −65 3.14-rc/windows/windowsservercore-1809/Dockerfile
  37. +0 −111 3.9/bookworm/Dockerfile
  38. +0 −111 3.9/bullseye/Dockerfile
  39. +0 −144 3.9/slim-bookworm/Dockerfile
  40. +0 −144 3.9/slim-bullseye/Dockerfile
  41. +4 −5 Dockerfile-linux.template
  42. +4 −64 versions.json
  43. +0 −3 versions.sh
34 changes: 34 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
version: 2.1

executors:
docker-arm64:
docker:
- image: cimg/python:3.10.13
resource_class: arm.large

jobs:
build-and-push:
executor: docker-arm64
environment:
DOCKER_IMAGE: "luislhl/docker-python"
PLATFORM: "linux/arm64"
DOCKERFILE_PATH: "./3.10/slim-bullseye/Dockerfile"
steps:
- checkout
- setup_remote_docker
- run:
name: Login to Docker Hub
command: echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- run:
name: Build Docker Image
command: |
docker build --platform $PLATFORM -f $DOCKERFILE_PATH -t $DOCKER_IMAGE:3.10-slim-bullseye .
- run:
name: Push Docker Image
command: docker push $DOCKER_IMAGE:3.10-slim-bullseye

workflows:
version: 2
build-and-push-workflow:
jobs:
- build-and-push
77 changes: 24 additions & 53 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -4,8 +4,6 @@ on:
pull_request:
push:
workflow_dispatch:
schedule:
- cron: 0 0 * * 0

defaults:
run:
@@ -16,57 +14,30 @@ concurrency:
cancel-in-progress: true

jobs:

generate-jobs:
name: Generate Jobs
build:
strategy:
fail-fast: false
matrix:
python-version: ["3.10"]
variant: [slim-bullseye]
runs-on: ubuntu-latest
outputs:
strategy: ${{ steps.generate-jobs.outputs.strategy }}
steps:
- uses: actions/checkout@v4
- uses: docker-library/bashbrew@HEAD
- id: generate-jobs
name: Generate Jobs
run: |
strategy="$("$BASHBREW_SCRIPTS/github-actions/generate.sh")"
# https://github.com/docker-library/python/pull/706 (ensure we don't have any unexpected ".a" leftovers in "/usr/local")
strategy="$(jq <<<"$strategy" -c '
.matrix.include |= map(
if .os == "ubuntu-latest" then
.runs.test += "\n" + (
.meta.entries
| map(
.tags[0]
| "aFiles=\"$(docker run --rm \(. | @sh) find /usr/local -name \"*.a\" | tee /dev/stderr)\"; [ -z \"$aFiles\" ]"
)
| join("\n")
)
else . end
)
')"
EOF="EOF-$RANDOM-$RANDOM-$RANDOM"
echo "strategy<<$EOF" >> "$GITHUB_OUTPUT"
jq <<<"$strategy" . | tee -a "$GITHUB_OUTPUT"
echo "$EOF" >> "$GITHUB_OUTPUT"
test:
needs: generate-jobs
strategy: ${{ fromJson(needs.generate-jobs.outputs.strategy) }}
name: ${{ matrix.name }}
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: Prepare Environment
run: ${{ matrix.runs.prepare }}
- name: Pull Dependencies
run: ${{ matrix.runs.pull }}
- name: Build ${{ matrix.name }}
run: ${{ matrix.runs.build }}
- name: History ${{ matrix.name }}
run: ${{ matrix.runs.history }}
- name: Test ${{ matrix.name }}
run: ${{ matrix.runs.test }}
- name: '"docker images"'
run: ${{ matrix.runs.images }}
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build and push
uses: docker/build-push-action@v6
with:
file: ./${{ matrix.python-version }}/${{ matrix.variant }}/Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: luislhl/docker-python:${{ matrix.python-version }}-${{ matrix.variant }}
23 changes: 23 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
language: python

python:
- "3.10"

services:
- docker

env:
global:
- DOCKER_IMAGE="luislhl/docker-python"
- PLATFORM="linux/arm64"
- DOCKERFILE_PATH="./${TRAVIS_PYTHON_VERSION}/slim-bullseye/Dockerfile"

jobs:
include:
- arch: arm64
dist: focal
name: "Build ARM64 Docker Image"
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --platform $PLATFORM -f $DOCKERFILE_PATH -t $DOCKER_IMAGE:$TRAVIS_PYTHON_VERSION-slim-bullseye .
- docker push $DOCKER_IMAGE:$TRAVIS_PYTHON_VERSION-slim-bullseye
140 changes: 0 additions & 140 deletions 3.10/alpine3.20/Dockerfile

This file was deleted.

Loading