Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update base image to use Python 3.12.1 & Alpine 3.19 #309

Merged
merged 3 commits into from
Jan 4, 2024
Merged

Update base image to use Python 3.12.1 & Alpine 3.19 #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1fb183
Update base image to use Python 3.12.1 & Alpine 3.19
frenck Jan 4, 2024
b9b3cb8
Update home-assistant/builder to 2024.01.0
frenck Jan 4, 2024
411db20
Adjust wheels builder configuration
frenck Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/builder.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ jobs:
echo "changed=true" >> $GITHUB_OUTPUT
fi

- name: Build wheels cp311
- name: Build wheels cp312
uses: home-assistant/[email protected]
if: steps.requirements.outputs.changed == 'true'
with:
tag: musllinux_1_2
abi: cp311
abi: cp312
arch: ${{ matrix.arch }}
wheels-key: ${{ secrets.WHEELS_KEY }}
apk: "mariadb-dev;postgresql-dev;libffi-dev"
Expand All @@ -83,7 +83,7 @@ jobs:
run: echo "BUILD_ARGS=--test" >> $GITHUB_ENV

- name: Build base image
uses: home-assistant/builder@2023.12.0
uses: home-assistant/builder@2024.01.0
with:
args: |
$BUILD_ARGS \
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ RUN apk add --no-cache \
&& mkdir build \
&& cd build \
&& cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \
-DPYTHON_LIBRARY="/usr/local/lib/libpython3.11.so" \
-DPYTHON_INCLUDE_DIR="/usr/local/include/python3.11" \
-DPYTHON_LIBRARY="/usr/local/lib/libpython3.12.so" \
-DPYTHON_INCLUDE_DIR="/usr/local/include/python3.12" \
-DHAVE_LINUX_API=1 \
.. \
&& make -j"$(nproc)" \
&& make install \
&& echo "cec" > "/usr/local/lib/python3.11/site-packages/cec.pth" \
&& echo "cec" > "/usr/local/lib/python3.12/site-packages/cec.pth" \
&& apk del .build-dependencies \
&& rm -rf \
/usr/src/libcec \
Expand Down
10 changes: 5 additions & 5 deletions build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
image: ghcr.io/home-assistant/{arch}-homeassistant-base
build_from:
aarch64: ghcr.io/home-assistant/aarch64-base-python:3.11-alpine3.18
armhf: ghcr.io/home-assistant/armhf-base-python:3.11-alpine3.18
armv7: ghcr.io/home-assistant/armv7-base-python:3.11-alpine3.18
amd64: ghcr.io/home-assistant/amd64-base-python:3.11-alpine3.18
i386: ghcr.io/home-assistant/i386-base-python:3.11-alpine3.18
aarch64: ghcr.io/home-assistant/aarch64-base-python:3.12-alpine3.19
armhf: ghcr.io/home-assistant/armhf-base-python:3.12-alpine3.19
armv7: ghcr.io/home-assistant/armv7-base-python:3.12-alpine3.19
amd64: ghcr.io/home-assistant/amd64-base-python:3.12-alpine3.19
i386: ghcr.io/home-assistant/i386-base-python:3.12-alpine3.19
codenotary:
signer: [email protected]
base_image: [email protected]
Expand Down
Loading