Skip to content

Commit d262bcb

Browse files
authored
Merge pull request #137 from emqx/250815-add-debian-13
Delete debian10 add debian13
2 parents 23cd24d + 45baed3 commit d262bcb

File tree

7 files changed

+67
-98
lines changed

7 files changed

+67
-98
lines changed

.github/workflows/base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ jobs:
3535
- ubuntu22.04
3636
- ubuntu20.04
3737
- ubuntu18.04
38+
- debian13
3839
- debian12
3940
- debian11
40-
- debian10
4141
- el9
4242
- el8
4343
- el7

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
"ubuntu22.04",
3232
"ubuntu20.04",
3333
"ubuntu18.04",
34+
"debian13",
3435
"debian12",
3536
"debian11",
36-
"debian10",
3737
"el9",
3838
"el8",
3939
"el7",

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ jobs:
4343
"ubuntu22.04",
4444
"ubuntu20.04",
4545
"ubuntu18.04",
46+
"debian13",
4647
"debian12",
4748
"debian11",
48-
"debian10",
4949
"el9",
5050
"el8",
5151
"el7",

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
IMAGES = alpine3.15.1 alpine3.21.3 amzn2 amzn2023 debian10 debian11 debian12 el7 el8 el9 ubuntu18.04 ubuntu20.04 ubuntu22.04 ubuntu24.04
1+
IMAGES = alpine3.15.1 alpine3.21.3 amzn2 amzn2023 debian11 debian12 debian13 el7 el8 el9 ubuntu18.04 ubuntu20.04 ubuntu22.04 ubuntu24.04
22

33
.PHONY: all
44
all: $(IMAGES)

debian10/Dockerfile

Lines changed: 0 additions & 93 deletions
This file was deleted.

debian13/Dockerfile

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
ARG BUILD_FROM=debian:13
2+
# TODO: pull public.ecr.aws/debian/debian:13 when available
3+
FROM ${BUILD_FROM}
4+
5+
# Avoid getting asked questions during installation (tzdata)
6+
ENV DEBIAN_FRONTEND=noninteractive
7+
8+
RUN apt-get update && apt-get install -y \
9+
autoconf \
10+
automake \
11+
autotools-dev \
12+
bison \
13+
build-essential \
14+
cmake \
15+
curl \
16+
debhelper \
17+
expect \
18+
flex \
19+
git \
20+
jq \
21+
krb5-admin-server \
22+
krb5-kdc \
23+
libffi-dev \
24+
libkrb5-3 \
25+
libkrb5-dev \
26+
libncurses5-dev \
27+
libsasl2-2 \
28+
libsasl2-dev \
29+
libsasl2-modules-gssapi-mit \
30+
libssl-dev \
31+
libtool \
32+
procps \
33+
python3 \
34+
python3-pip \
35+
unixodbc \
36+
unixodbc-dev \
37+
unzip \
38+
vim \
39+
wget \
40+
zip \
41+
zlib1g-dev \
42+
&& apt-get clean \
43+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
44+
45+
RUN ln -sf /usr/bin/python3 /usr/bin/python && \
46+
ln -sf /usr/bin/pip3 /usr/bin/pip
47+
48+
RUN cmake --version
49+
50+
WORKDIR /
51+
52+
# Elixir complains if runs without UTF-8
53+
ENV LC_ALL=C.UTF-8
54+
ENV LANG=C.UTF-8
55+
56+
# Install Rustup to a system-wide location
57+
ENV RUSTUP_HOME=/usr/local/lib/rustup
58+
ENV CARGO_HOME=/usr/local/cargo
59+
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
60+
ENV PATH="/usr/local/cargo/bin:${PATH}"
61+
62+
CMD [ "/bin/bash" ]

get-fdb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ elif [[ "${ID:-}" =~ debian|ubuntu ]]; then
3838
ARCH=$(dpkg --print-architecture)
3939
SYSTEM="${ID}${VERSION_ID}"
4040
case ${SYSTEM} in
41-
debian11 | debian12 | ubuntu20.04 | ubuntu22.04 | ubuntu24.04)
41+
debian11 | debian12 | debian13 | ubuntu20.04 | ubuntu22.04 | ubuntu24.04)
4242
wget "${BASE_URL}/foundationdb-clients_${FDB_VERSION}-1_${ARCH}.deb" -O foundationdb-clients.deb
4343
dpkg -i foundationdb-clients.deb
4444
rm foundationdb-clients.deb

0 commit comments

Comments
 (0)