Skip to content

Commit d75e853

Browse files
authored
Merge pull request #1961 from kivy/feature/ubuntu24_docker_build
🔨 Bump Docker image to Ubuntu 24.04
2 parents 223cf06 + 41317fb commit d75e853

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# Or simply recreate the directory from the host with:
2929
# rm -rf ~/.buildozer && mkdir ~/.buildozer
3030

31-
FROM ubuntu:22.04
31+
FROM ubuntu:24.04
3232

3333
ENV USER="user"
3434
ENV HOME_DIR="/home/${USER}"
@@ -64,6 +64,7 @@ RUN apt update -qq > /dev/null \
6464
pkg-config \
6565
python3-pip \
6666
python3-setuptools \
67+
python3-venv \
6768
sudo \
6869
unzip \
6970
zip \
@@ -79,7 +80,9 @@ USER ${USER}
7980
WORKDIR ${WORK_DIR}
8081
COPY --chown=user:user . ${SRC_DIR}
8182

82-
# installs buildozer and dependencies
83-
RUN pip3 install --user --upgrade "Cython<3.0" wheel pip ${SRC_DIR}
83+
# installs buildozer and dependencies from a virtual environment
84+
ENV PATH="${HOME_DIR}/.venv/bin:${PATH}"
85+
RUN python3 -m venv ${HOME_DIR}/.venv && \
86+
pip3 install --upgrade "Cython<3.0" wheel pip ${SRC_DIR}
8487

8588
ENTRYPOINT ["buildozer"]

docs/source/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Install Buildozer and it's required Python packages::
5353
pip install buildozer, setuptools, cython==0.29.34
5454

5555

56-
Install on Ubuntu 20.04 and 22.04 (64bit)
56+
Install on Ubuntu 22.04 and 24.04 (64bit)
5757
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5858

5959
Install the system packages on which a Buildozer build may depend::

0 commit comments

Comments
 (0)