Skip to content

Commit 5c5a921

Browse files
committed
chore(cross): Install python 3.14.0rc1 / 3.13.5
1 parent 95dc46e commit 5c5a921

File tree

6 files changed

+53
-47
lines changed

6 files changed

+53
-47
lines changed

rust/cubestore/cross/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ Keep in mind:
1515
- Don't use modern unix*, which ship newest `libc` (current used 2.31)
1616
- Better to use one clang/gcc version across images (`clang-14`)
1717
- Try to use one OS for all images (`debian`) for unix*
18-
- Install 3 last versions for Python (`3.9`, `3.10`, `3.11`)
1918

2019
```sh
21-
# dmY
20+
export DOCKER_BUILDKIT_MAX_PARALLELISM=2
2221
docker buildx bake x86_64-unknown-linux-gnu-python --push
2322
docker buildx bake aarch64-unknown-linux-gnu-python --push
2423
docker buildx bake x86_64-unknown-linux-musl-python --push
2524

26-
export CROSS_VERSION=01082024
25+
# dmY
26+
export CROSS_VERSION=31072025
2727

2828
# Verify versions
2929
docker run --platform linux/amd64 --rm -it cubejs/rust-cross:x86_64-unknown-linux-gnu-$CROSS_VERSION cc --version

rust/cubestore/cross/aarch64-unknown-linux-gnu-python.Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
FROM base
22

33
ARG PYTHON_VERSION
4+
ARG PYTHON_VERSION_SUFFIX
45
ARG PYTHON_RELEASE
56

67
# python is required for cross compiling python :D
78
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y python${PYTHON_RELEASE} \
89
&& rm -rf /var/lib/apt/lists/*;
910

10-
RUN wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz -O - | tar -xz \
11-
&& cd Python-${PYTHON_VERSION} \
11+
RUN wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}${PYTHON_VERSION_SUFFIX}.tgz -O - | tar -xz \
12+
&& cd Python-${PYTHON_VERSION}${PYTHON_VERSION_SUFFIX} \
1213
&& touch config.site-aarch64 \
1314
&& echo "ac_cv_buggy_getaddrinfo=no" >> config.site-aarch64 \
1415
&& echo "ac_cv_file__dev_ptmx=no" >> config.site-aarch64 \

rust/cubestore/cross/aarch64-unknown-linux-gnu.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN wget https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz -O - | tar -xz && \
4545
make install && \
4646
cd .. && rm -rf zlib-${ZLIB_VERSION};
4747

48-
# https://www.openssl.org/source/old/1.1.1/
48+
# https://openssl-library.org/source/old/1.1.1/
4949
ENV OPENSSL_VERSION=1.1.1w
5050
RUN wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O - | tar -xz \
5151
&& cd openssl-${OPENSSL_VERSION} \

rust/cubestore/cross/docker-bake.hcl

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,47 @@
11
variable "CROSS_VERSION" {
2-
default = "01082024"
2+
// dmY
3+
default = "31072025"
34
}
45

56
variable "LLVM_VERSION" {
67
default = "18"
78
}
89

10+
variable "PYTHON_VERSIONS" {
11+
default = [
12+
{
13+
python_version = "3.14.0"
14+
python_version_sufix = "rc1"
15+
python_release = "3.14"
16+
},
17+
{
18+
python_version = "3.13.5"
19+
python_version_sufix = ""
20+
python_release = "3.13"
21+
},
22+
{
23+
python_version = "3.12.4"
24+
python_version_sufix = ""
25+
python_release = "3.12"
26+
},
27+
{
28+
python_version = "3.11.3"
29+
python_version_sufix = ""
30+
python_release = "3.11"
31+
},
32+
{
33+
python_version = "3.10.11"
34+
python_version_sufix = ""
35+
python_release = "3.10"
36+
},
37+
{
38+
python_version = "3.9.18"
39+
python_version_sufix = ""
40+
python_release = "3.9"
41+
}
42+
]
43+
}
44+
945
target "aarch64-unknown-linux-gnu" {
1046
context = "."
1147
dockerfile = "aarch64-unknown-linux-gnu.Dockerfile"
@@ -24,29 +60,13 @@ target "aarch64-unknown-linux-gnu-python" {
2460
dockerfile = "aarch64-unknown-linux-gnu-python.Dockerfile"
2561
name = "aarch64-unknown-linux-gnu-python-${replace(item.python_release, ".", "-")}"
2662
matrix = {
27-
item = [
28-
{
29-
python_version = "3.12.4"
30-
python_release = "3.12"
31-
},
32-
{
33-
python_version = "3.11.3"
34-
python_release = "3.11"
35-
},
36-
{
37-
python_version = "3.10.11"
38-
python_release = "3.10"
39-
},
40-
{
41-
python_version = "3.9.18"
42-
python_release = "3.9"
43-
}
44-
]
63+
item = PYTHON_VERSIONS
4564
}
4665
args = {
4766
CROSS_VERSION = CROSS_VERSION
4867
PYTHON_VERSION = item.python_version
49-
PYTHON_RELEASE = item.python_release
68+
PYTHON_RELEASE = item.python_release,
69+
PYTHON_VERSION_SUFFIX = item.python_version_sufix
5070
}
5171
tags = ["cubejs/rust-cross:aarch64-unknown-linux-gnu-${CROSS_VERSION}-python-${item.python_release}"]
5272
platforms = ["linux/amd64"]
@@ -80,29 +100,13 @@ target "x86_64-unknown-linux-gnu-python" {
80100
dockerfile = "x86_64-unknown-linux-gnu-python.Dockerfile"
81101
name = "x86_64-unknown-linux-gnu-python-${replace(item.python_release, ".", "-")}"
82102
matrix = {
83-
item = [
84-
{
85-
python_version = "3.12.4"
86-
python_release = "3.12"
87-
},
88-
{
89-
python_version = "3.11.3"
90-
python_release = "3.11"
91-
},
92-
{
93-
python_version = "3.10.11"
94-
python_release = "3.10"
95-
},
96-
{
97-
python_version = "3.9.18"
98-
python_release = "3.9"
99-
}
100-
]
103+
item = PYTHON_VERSIONS
101104
}
102105
args = {
103106
CROSS_VERSION = CROSS_VERSION
104107
PYTHON_VERSION = item.python_version
105108
PYTHON_RELEASE = item.python_release
109+
PYTHON_VERSION_SUFFIX = item.python_version_sufix
106110
}
107111
tags = ["cubejs/rust-cross:x86_64-unknown-linux-gnu-${CROSS_VERSION}-python-${item.python_release}"]
108112
platforms = ["linux/amd64"]

rust/cubestore/cross/x86_64-unknown-linux-gnu-python.Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
FROM base
22

33
ARG PYTHON_VERSION
4+
ARG PYTHON_VERSION_SUFFIX
45
ARG PYTHON_RELEASE
56

6-
RUN cd tmp && wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz -O - | tar -xz \
7-
&& cd Python-${PYTHON_VERSION} \
7+
RUN cd tmp && wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}${PYTHON_VERSION_SUFFIX}.tgz -O - | tar -xz \
8+
&& cd Python-${PYTHON_VERSION}${PYTHON_VERSION_SUFFIX} \
89
&& ./configure \
910
--enable-shared \
1011
--with-openssl=/openssl \

rust/cubestore/cross/x86_64-unknown-linux-gnu.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-$LLV
1919
&& update-alternatives --install /usr/bin/cc cc /usr/bin/clang-$LLVM_VERSION 100 \
2020
&& update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-$LLVM_VERSION 100;
2121

22-
# https://www.openssl.org/source/old/1.1.1/
22+
# https://openssl-library.org/source/old/1.1.1/
2323
ARG OPENSSL_VERSION=1.1.1w
2424
RUN cd tmp && wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O - | tar -xz \
2525
&& cd openssl-${OPENSSL_VERSION} \

0 commit comments

Comments
 (0)