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: home-assistant/docker-base
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2024.06.0
Choose a base ref
...
head repository: home-assistant/docker-base
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 20 commits
  • 21 files changed
  • 6 contributors

Commits on Jun 17, 2024

  1. Bump actions/checkout from 4.1.6 to 4.1.7 (#270)

    @dependabot
    dependabot[bot] authored Jun 17, 2024
    Copy the full SHA
    862b708 View commit details

Commits on Jun 22, 2024

  1. Update Python 3.10.14/3.11.9/3.12.4 & pip 24.1 (#271)

    @frenck
    frenck authored Jun 22, 2024
    Copy the full SHA
    90a3832 View commit details

Commits on Jun 27, 2024

  1. Remove debian buster as not supported (#272)

    @adeepn
    adeepn authored Jun 27, 2024
    Copy the full SHA
    f075b91 View commit details

Commits on Aug 8, 2024

  1. Update Python 3.12.5 & pip 24.2 (#274)

    @frenck
    frenck authored Aug 8, 2024
    Copy the full SHA
    ef7c6e1 View commit details

Commits on Aug 22, 2024

  1. Bump home-assistant/builder from 2024.03.5 to 2024.08.1 (#275)

    @dependabot
    dependabot[bot] authored Aug 22, 2024
    Copy the full SHA
    735af08 View commit details

Commits on Aug 26, 2024

  1. Bump home-assistant/builder from 2024.08.1 to 2024.08.2 (#276)

    @dependabot
    dependabot[bot] authored Aug 26, 2024
    Copy the full SHA
    ca9ca93 View commit details

Commits on Sep 30, 2024

  1. Bump actions/checkout from 4.1.7 to 4.2.0 (#277) 

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored Sep 30, 2024
    Copy the full SHA
    f786d96 View commit details

Commits on Oct 14, 2024

  1. Bump actions/checkout from 4.2.0 to 4.2.1 (#280) 

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored Oct 14, 2024
    Copy the full SHA
    623a541 View commit details

Commits on Oct 28, 2024

  1. Bump actions/checkout from 4.2.1 to 4.2.2 (#282)

    @dependabot
    dependabot[bot] authored Oct 28, 2024
    Copy the full SHA
    5589e45 View commit details

Commits on Nov 5, 2024

  1. Add Python 3.13; Drop Python 3.10 (#278) 

    Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
    @frenck @cdce8p
    frenck and cdce8p authored Nov 5, 2024
    Copy the full SHA
    26a71a0 View commit details

Commits on Nov 7, 2024

  1. Backport Morsel creation speed up patch from cpython gh-126156 (#284)

    @bdraco
    bdraco authored Nov 7, 2024
    Copy the full SHA
    23602a3 View commit details

  2. Update pip to 24.3.1 (#285)

    @frenck
    frenck authored Nov 7, 2024
    Copy the full SHA
    9fa1009 View commit details

Commits on Nov 26, 2024

  1. Bump tempio to 2024.11.2 (#286)

    @agners
    agners authored Nov 26, 2024
    Copy the full SHA
    be03184 View commit details

Commits on Dec 7, 2024

  1. Add patches for CVE-2024-12254 (#287)

    @bdraco
    bdraco authored Dec 7, 2024
    Copy the full SHA
    12e3523 View commit details

Commits on Dec 9, 2024

  1. Add support for alpine 3.21 and drop 3.17 (#288)

    @cdce8p
    cdce8p authored Dec 9, 2024
    Copy the full SHA
    50791f5 View commit details

Commits on Dec 13, 2024

  1. Update Python versions (#290)

    @cdce8p
    cdce8p authored Dec 13, 2024
    Copy the full SHA
    5859754 View commit details

  2. Update Python images to alpine 3.21 (#289) 

    Co-authored-by: Franck Nijhof <git@frenck.dev>
    @cdce8p @frenck
    cdce8p and frenck authored Dec 13, 2024
    Copy the full SHA
    d3fb40b View commit details

Commits on Jan 20, 2025

  1. Bump release-drafter/release-drafter from 6.0.0 to 6.1.0 (#293) 

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored Jan 20, 2025
    Copy the full SHA
    56656ab View commit details

Commits on Feb 14, 2025

  1. Update Python to 3.12.9/3.13.2 and pip to 25.0.1 (#294) 

    * Update Python to 3.12.9/3.13.2

* Update pip to 25.0.1

* Try with ubuntu-22.04 as builder
    @agners
    agners authored Feb 14, 2025
    Copy the full SHA
    d157d2a View commit details

Commits on Mar 6, 2025

  1. Bump home-assistant/builder from 2024.08.2 to 2025.02.0 (#296) 

    Bumps [home-assistant/builder](https://github.com/home-assistant/builder) from 2024.08.2 to 2025.02.0.
- [Release notes](https://github.com/home-assistant/builder/releases)
- [Commits](home-assistant/builder@2024.08.2...2025.02.0)

---
updated-dependencies:
- dependency-name: home-assistant/builder
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored Mar 6, 2025
    Copy the full SHA
    2375a33 View commit details
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
"build": {
"dockerfile": "Dockerfile",
// Update 'VARIANT' to pick an Alpine version: 3.10, 3.11, 3.12
"args": { "VARIANT": "3.12" }
"args": { "VARIANT": "3.13" }
},

// Set *default* container specific settings.json values on container create.
48 changes: 24 additions & 24 deletions .github/workflows/builder.yml
View file
Original file line number Diff line number Diff line change
@@ -8,16 +8,16 @@ on:

env:
BUILD_TYPE: base
ALPINE_LATEST: "3.20"
ALPINE_LATEST: "3.21"
DEBIAN_LATEST: "bookworm"
UBUNTU_LATEST: "20.4"
RASPBIAN_LATEST: "bullseye"
PYTHON_LATEST: "3.12"
PYTHON_LATEST: "3.13"

jobs:
init:
name: Initialize build
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
architectures_alpine: ${{ steps.info_alpine.outputs.architectures }}
architectures_debian: ${{ steps.info_debian.outputs.architectures }}
@@ -26,7 +26,7 @@ jobs:
release: ${{ steps.version.outputs.version }}
steps:
- name: Checkout the repository
uses: actions/checkout@v4.1.6
uses: actions/checkout@v4.2.2
with:
fetch-depth: 0

@@ -63,18 +63,18 @@ jobs:
build_alpine:
name: Build ${{ matrix.arch }} alpine ${{ matrix.version }} base image
needs: init
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
contents: read
id-token: write
packages: write
strategy:
matrix:
arch: ${{ fromJson(needs.init.outputs.architectures_alpine) }}
version: ["3.17", "3.18", "3.19", "3.20"]
version: ["3.18", "3.19", "3.20", "3.21"]
steps:
- name: Checkout the repository
uses: actions/checkout@v4.1.6
uses: actions/checkout@v4.2.2

- name: Login to GitHub Container Registry
if: github.event_name == 'release'
@@ -94,7 +94,7 @@ jobs:
fi
- name: Build base image
uses: home-assistant/builder@2024.03.5
uses: home-assistant/builder@2025.02.0
with:
args: |
$BUILD_ARGS \
@@ -107,18 +107,18 @@ jobs:
build_debian:
name: Build ${{ matrix.arch }} debian ${{ matrix.version }} base image
needs: init
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
contents: read
id-token: write
packages: write
strategy:
matrix:
arch: ${{ fromJson(needs.init.outputs.architectures_debian) }}
version: ["buster", "bullseye", "bookworm"]
version: ["bullseye", "bookworm"]
steps:
- name: Checkout the repository
uses: actions/checkout@v4.1.6
uses: actions/checkout@v4.2.2

- name: Login to GitHub Container Registry
if: github.event_name == 'release'
@@ -138,7 +138,7 @@ jobs:
fi
- name: Build base image
uses: home-assistant/builder@2024.03.5
uses: home-assistant/builder@2025.02.0
with:
args: |
$BUILD_ARGS \
@@ -152,7 +152,7 @@ jobs:
build_ubuntu:
name: Build ${{ matrix.arch }} ubuntu ${{ matrix.version }} base image
needs: init
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
contents: read
id-token: write
@@ -163,7 +163,7 @@ jobs:
version: ["16.04", "18.04", "20.04"]
steps:
- name: Checkout the repository
uses: actions/checkout@v4.1.6
uses: actions/checkout@v4.2.2

- name: Login to GitHub Container Registry
if: github.event_name == 'release'
@@ -183,7 +183,7 @@ jobs:
fi
- name: Build base image
uses: home-assistant/builder@2024.03.5
uses: home-assistant/builder@2025.02.0
with:
args: |
$BUILD_ARGS \
@@ -196,18 +196,18 @@ jobs:
build_raspbian:
name: Build ${{ matrix.arch }} raspbian ${{ matrix.version }} base image
needs: init
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
contents: read
id-token: write
packages: write
strategy:
matrix:
arch: ${{ fromJson(needs.init.outputs.architectures_raspbian) }}
version: ["buster", "bullseye", "bookworm"]
version: ["bullseye", "bookworm"]
steps:
- name: Checkout the repository
uses: actions/checkout@v4.1.6
uses: actions/checkout@v4.2.2

- name: Login to GitHub Container Registry
if: github.event_name == 'release'
@@ -227,7 +227,7 @@ jobs:
fi
- name: Build base image
uses: home-assistant/builder@2024.03.5
uses: home-assistant/builder@2025.02.0
with:
args: |
$BUILD_ARGS \
@@ -241,19 +241,19 @@ jobs:
build_python:
name: Build ${{ matrix.arch }} alpine ${{ matrix.version }} - python ${{ matrix.python }} base image
needs: [init, build_alpine]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
contents: read
id-token: write
packages: write
strategy:
matrix:
arch: ${{ fromJson(needs.init.outputs.architectures_alpine) }}
version: ["3.18", "3.19", "3.20"]
python: ["3.10", "3.11", "3.12"]
version: ["3.19", "3.20", "3.21"]
python: ["3.11", "3.12", "3.13"]
steps:
- name: Checkout the repository
uses: actions/checkout@v4.1.6
uses: actions/checkout@v4.2.2

- name: Login to GitHub Container Registry
if: github.event_name == 'release'
@@ -273,7 +273,7 @@ jobs:
fi
- name: Build base image
uses: home-assistant/builder@2024.03.5
uses: home-assistant/builder@2025.02.0
with:
args: |
$BUILD_ARGS \
4 changes: 2 additions & 2 deletions .github/workflows/release-drafter.yml
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ jobs:
name: Release Drafter
steps:
- name: Checkout the repository
uses: actions/checkout@v4.1.6
uses: actions/checkout@v4.2.2
with:
fetch-depth: 0

@@ -36,7 +36,7 @@ jobs:
echo "::set-output name=version::$datepre.$newpost"
- name: Run Release Drafter
uses: release-drafter/release-drafter@v6.0.0
uses: release-drafter/release-drafter@v6.1.0
with:
tag: ${{ steps.version.outputs.version }}
name: ${{ steps.version.outputs.version }}
33 changes: 16 additions & 17 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -13,11 +13,11 @@ We support version that are not EOL: https://alpinelinux.org/releases/

| Image | OS | Tags | latest |
|-------|----|------|--------|
| armhf-base | Alpine | 3.17 3.18, 3.19, 3.20 | 3.20 |
| armv7-base | Alpine | 3.17 3.18, 3.19, 3.20 | 3.20 |
| aarch64-base | Alpine | 3.17 3.18, 3.19, 3.20 | 3.20 |
| amd64-base | Alpine | 3.17 3.18, 3.19, 3.20 | 3.20 |
| i386-base | Alpine | 3.17 3.18, 3.19, 3.20 | 3.20 |
| armhf-base | Alpine | 3.18, 3.19, 3.20, 3.21 | 3.21 |
| armv7-base | Alpine | 3.18, 3.19, 3.20, 3.21 | 3.21 |
| aarch64-base | Alpine | 3.18, 3.19, 3.20, 3.21 | 3.21 |
| amd64-base | Alpine | 3.18, 3.19, 3.20, 3.21 | 3.21 |
| i386-base | Alpine | 3.18, 3.19, 3.20, 3.21 | 3.21 |

### jemalloc

@@ -29,11 +29,11 @@ We support the latest 3 release with the latest 3 Alpine version.

| Image | OS | Tags | latest |
|-------|----|------|--------|
| armhf-base-python | Alpine | 3.10, 3.11, 3.12, 3.10-alpine3.18, 3.10-alpine3.19, 3.10-alpine3.20, 3.11-alpine3.18, 3.11-alpine3.19, 3.11-alpine3.20, 3.12-alpine3.18, 3.12-alpine3.19, 3.12-alpine3.20 | 3.12-alpine3.20 |
| armv7-base-python | Alpine | 3.10, 3.11, 3.12, 3.10-alpine3.18, 3.10-alpine3.19, 3.10-alpine3.20, 3.11-alpine3.18, 3.11-alpine3.19, 3.11-alpine3.20, 3.12-alpine3.18, 3.12-alpine3.19, 3.12-alpine3.20 | 3.12-alpine3.20 |
| aarch64-base-python | Alpine | 3.10, 3.11, 3.12, 3.10-alpine3.18, 3.10-alpine3.19, 3.10-alpine3.20, 3.11-alpine3.18, 3.11-alpine3.19, 3.11-alpine3.20, 3.12-alpine3.18, 3.12-alpine3.19, 3.12-alpine3.20 | 3.12-alpine3.20 |
| amd64-base-python | Alpine | 3.10, 3.11, 3.12, 3.10-alpine3.18, 3.10-alpine3.19, 3.10-alpine3.20, 3.11-alpine3.18, 3.11-alpine3.19, 3.11-alpine3.20, 3.12-alpine3.18, 3.12-alpine3.19, 3.12-alpine3.20 | 3.12-alpine3.20 |
| i386-base-python | Alpine | 3.10, 3.11, 3.12, 3.10-alpine3.18, 3.10-alpine3.19, 3.10-alpine3.20, 3.11-alpine3.18, 3.11-alpine3.19, 3.11-alpine3.20, 3.12-alpine3.18, 3.12-alpine3.19, 3.12-alpine3.20 | 3.12-alpine3.20 |
| armhf-base-python | Alpine | 3.11, 3.12, 3.13, 3.11-alpine3.19, 3.11-alpine3.20, 3.11-alpine3.21, 3.12-alpine3.19, 3.12-alpine3.20, 3.12-alpine3.21, 3.13-alpine3.19, 3.13-alpine3.20, 3.13-alpine3.21 | 3.13-alpine3.21 |
| armv7-base-python | Alpine | 3.11, 3.12, 3.13, 3.11-alpine3.19, 3.11-alpine3.20, 3.11-alpine3.21, 3.12-alpine3.19, 3.12-alpine3.20, 3.12-alpine3.21, 3.13-alpine3.19, 3.13-alpine3.20, 3.13-alpine3.21 | 3.13-alpine3.21 |
| aarch64-base-python | Alpine | 3.11, 3.12, 3.13, 3.11-alpine3.19, 3.11-alpine3.20, 3.11-alpine3.21, 3.12-alpine3.19, 3.12-alpine3.20, 3.12-alpine3.21, 3.13-alpine3.19, 3.13-alpine3.20, 3.13-alpine3.21 | 3.13-alpine3.21 |
| amd64-base-python | Alpine | 3.11, 3.12, 3.13, 3.11-alpine3.19, 3.11-alpine3.20, 3.11-alpine3.21, 3.12-alpine3.19, 3.12-alpine3.20, 3.12-alpine3.21, 3.13-alpine3.19, 3.13-alpine3.20, 3.13-alpine3.21 | 3.13-alpine3.21 |
| i386-base-python | Alpine | 3.11, 3.12, 3.13, 3.11-alpine3.19, 3.11-alpine3.20, 3.11-alpine3.21, 3.12-alpine3.19, 3.12-alpine3.20, 3.12-alpine3.21, 3.13-alpine3.19, 3.13-alpine3.20, 3.13-alpine3.21 | 3.13-alpine3.21 |

## Others

@@ -43,11 +43,11 @@ We support the latest 3 release with the latest 3 Alpine version.

| Image | OS | Tags | latest |
|-------|----|------|--------|
| armv7-base-debian | Debian | buster, bullseye, bookworm | bookworm |
| armhf-base-debian | Debian | buster, bullseye, bookworm | bookworm |
| aarch64-base-debian | Debian | buster, bullseye, bookworm | bookworm |
| amd64-base-debian | Debian | buster, bullseye, bookworm | bookworm |
| i386-base-debian | Debian | buster, bullseye, bookworm | bookworm |
| armv7-base-debian | Debian | bullseye, bookworm | bookworm |
| armhf-base-debian | Debian | bullseye, bookworm | bookworm |
| aarch64-base-debian | Debian | bullseye, bookworm | bookworm |
| amd64-base-debian | Debian | bullseye, bookworm | bookworm |
| i386-base-debian | Debian | bullseye, bookworm | bookworm |

### Ubuntu images

@@ -64,5 +64,4 @@ We support the latest 3 release with the latest 3 Alpine version.

| Image | OS | Tags | latest |
|-------|----|------|--------|
| armhf-base-raspbian | Raspbian | buster, bullseye, bookworm | bullseye |

| armhf-base-raspbian | Raspbian | bullseye, bookworm | bullseye |
2 changes: 1 addition & 1 deletion alpine/build.yaml
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ cosign:
identity: https://github.com/home-assistant/docker-base/.*
args:
BASHIO_VERSION: 0.16.2
TEMPIO_VERSION: 2021.09.0
TEMPIO_VERSION: 2024.11.2
S6_OVERLAY_VERSION: 3.1.6.2
JEMALLOC_VERSION: 5.3.0
labels:
2 changes: 1 addition & 1 deletion debian/build.yaml
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ cosign:
identity: https://github.com/home-assistant/docker-base/.*
args:
BASHIO_VERSION: 0.16.2
TEMPIO_VERSION: 2021.09.0
TEMPIO_VERSION: 2024.11.2
S6_OVERLAY_VERSION: 3.1.6.2
labels:
io.hass.base.name: debian
17 changes: 0 additions & 17 deletions python/3.10/arm-alignment.patch
View file

This file was deleted.

16 changes: 0 additions & 16 deletions python/3.10/asynctio_unix_events.patch
View file

This file was deleted.

16 changes: 0 additions & 16 deletions python/3.10/fix-xattrs-glibc.patch
View file

This file was deleted.

4 changes: 2 additions & 2 deletions python/3.11/build.yaml
View file
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ cosign:
base_identity: https://github.com/home-assistant/docker-base/.*
identity: https://github.com/home-assistant/docker-base/.*
args:
PYTHON_VERSION: 3.11.8
PIP_VERSION: 24.0
PYTHON_VERSION: 3.11.11
PIP_VERSION: 25.0.1
GPG_KEY: A035C8C19219BA821ECEA86B64E628F8D684696D
labels:
io.hass.base.name: python
4 changes: 2 additions & 2 deletions python/3.12/build.yaml
View file
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ cosign:
base_identity: https://github.com/home-assistant/docker-base/.*
identity: https://github.com/home-assistant/docker-base/.*
args:
PYTHON_VERSION: 3.12.2
PIP_VERSION: 24.0
PYTHON_VERSION: 3.12.9
PIP_VERSION: 25.0.1
GPG_KEY: 7169605F62C751356D054A26A821E680E5FA6305
labels:
io.hass.base.name: python
39 changes: 39 additions & 0 deletions python/3.12/gh-126156-Improve-performance-of-creating-Morsel-obj.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From dd3c0fa3fd2795326dae0e0ed63c668f5506cf32 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 31 Oct 2024 14:05:40 -0500
Subject: [PATCH] gh-126156: Improve performance of creating `Morsel` objects
(#126157)

Replaces the manually constructed loop with a call to `dict.update`
---
Lib/http/cookies.py | 5 +++--
.../Library/2024-10-30-00-12-22.gh-issue-126156.BOSqv0.rst | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
create mode 100644 Misc/NEWS.d/next/Library/2024-10-30-00-12-22.gh-issue-126156.BOSqv0.rst

diff --git a/Lib/http/cookies.py b/Lib/http/cookies.py
index 6b9ed24ad8e..d7e8d08b2d9 100644
--- a/Lib/http/cookies.py
+++ b/Lib/http/cookies.py
@@ -266,6 +266,8 @@ class Morsel(dict):
"samesite" : "SameSite",
}

+ _reserved_defaults = dict.fromkeys(_reserved, "")
+
_flags = {'secure', 'httponly'}

def __init__(self):
@@ -273,8 +275,7 @@ def __init__(self):
self._key = self._value = self._coded_value = None

# Set default attributes
- for key in self._reserved:
- dict.__setitem__(self, key, "")
+ dict.update(self, self._reserved_defaults)

@property
def key(self):
--
2.39.3 (Apple Git-145)

Loading