Skip to content

Commit e722d47

Browse files
authored
Merge pull request #75 from emqx/feat-add-rocky-linux9
feat: add rocky linux 9
2 parents ec23bc5 + 8373f0d commit e722d47

File tree

6 files changed

+54
-14
lines changed

6 files changed

+54
-14
lines changed

.github/workflows/base.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
- [debian11 , "linux/amd64,linux/arm64"]
3030
- [debian10 , "linux/amd64,linux/arm64"]
3131
- [debian9 , "linux/amd64,linux/arm64"]
32+
- [el9 , "linux/amd64,linux/arm64"]
3233
- [el8 , "linux/amd64,linux/arm64"]
3334
- [el7 , "linux/amd64,linux/arm64"]
3435
- [amzn2 , "linux/amd64,linux/arm64"]

.github/workflows/main.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ jobs:
4444
- [debian11 , "linux/amd64,linux/arm64"]
4545
- [debian10 , "linux/amd64,linux/arm64"]
4646
- [debian9 , "linux/amd64,linux/arm64"]
47+
- [el9 , "linux/amd64,linux/arm64"]
4748
- [el8 , "linux/amd64,linux/arm64"]
4849
- [el7 , "linux/amd64,linux/arm64"]
4950
- [amzn2 , "linux/amd64,linux/arm64"]
50-
- [raspbian10 , "linux/arm64"]
51-
- [raspbian9 , "linux/arm64"]
51+
# - [raspbian10 , "linux/arm64"]
52+
# - [raspbian9 , "linux/arm64"]
5253
- [alpine3.15.1, "linux/amd64,linux/arm64"]
5354

5455
steps:
@@ -108,6 +109,7 @@ jobs:
108109
- [debian11 , "linux/amd64,linux/arm64"]
109110
- [debian10 , "linux/amd64,linux/arm64"]
110111
- [debian9 , "linux/amd64,linux/arm64"]
112+
- [el9 , "linux/amd64,linux/arm64"]
111113
- [el8 , "linux/amd64,linux/arm64"]
112114
- [el7 , "linux/amd64,linux/arm64"]
113115
- [amzn2 , "linux/amd64,linux/arm64"]

.github/workflows/test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
- [debian11 , "linux/amd64,linux/arm64"]
4646
- [debian10 , "linux/amd64,linux/arm64"]
4747
- [debian9 , "linux/amd64,linux/arm64"]
48+
- [el9 , "linux/amd64,linux/arm64"]
4849
- [el8 , "linux/amd64,linux/arm64"]
4950
- [el7 , "linux/amd64,linux/arm64"]
5051
- [amzn2 , "linux/amd64,linux/arm64"]

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BUILD_FROM=ubuntu:20.04
1+
ARG BUILD_FROM=ubuntu:22.04
22
FROM ${BUILD_FROM}
33

44
ENV EMQX_BUILDER_IMAGE=${BUILD_FROM}

el9/Dockerfile

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
ARG BUILD_FROM=rockylinux:9
2+
FROM ${BUILD_FROM}
3+
4+
RUN dnf -y update && dnf -y groupinstall development
5+
RUN dnf -y install \
6+
jq \
7+
libatomic \
8+
ncurses-devel \
9+
openssl-devel \
10+
perl-FindBin \
11+
python3-pip \
12+
systemd \
13+
unixODBC \
14+
vim \
15+
wget \
16+
which
17+
18+
RUN dnf -y install \
19+
krb5-workstation \
20+
cyrus-sasl-devel \
21+
cyrus-sasl \
22+
cyrus-sasl-gssapi
23+
24+
# The following is not necessary for Kerberos authentication but makes testing
25+
# https://github.com/kafka4beam/sasl_auth easier
26+
RUN dnf -y install \
27+
krb5-server \
28+
expect
29+
30+
RUN ln -s /usr/bin/python3 /usr/bin/python
31+
32+
WORKDIR /
33+
34+
COPY get-cmake.sh /get-cmake.sh
35+
RUN /get-cmake.sh build
36+
37+
# cleanup
38+
RUN dnf clean all && \
39+
rm -rf /tmp/* && \
40+
rm -rf /var/tmp/*
41+
42+
# Elixir complains if runs without UTF-8
43+
ENV LC_ALL=C.UTF-8
44+
ENV LANG=C.UTF-8
45+
46+
WORKDIR /
47+
CMD [ "/bin/bash" ]

prepare-docker.sh

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

0 commit comments

Comments
 (0)