Skip to content

Commit

Permalink
Merge pull request #75 from emqx/feat-add-rocky-linux9
Browse files Browse the repository at this point in the history
feat: add rocky linux 9
  • Loading branch information
id authored Feb 22, 2023
2 parents ec23bc5 + 8373f0d commit e722d47
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 14 deletions.
1 change: 1 addition & 0 deletions .github/workflows/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
- [debian11 , "linux/amd64,linux/arm64"]
- [debian10 , "linux/amd64,linux/arm64"]
- [debian9 , "linux/amd64,linux/arm64"]
- [el9 , "linux/amd64,linux/arm64"]
- [el8 , "linux/amd64,linux/arm64"]
- [el7 , "linux/amd64,linux/arm64"]
- [amzn2 , "linux/amd64,linux/arm64"]
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@ jobs:
- [debian11 , "linux/amd64,linux/arm64"]
- [debian10 , "linux/amd64,linux/arm64"]
- [debian9 , "linux/amd64,linux/arm64"]
- [el9 , "linux/amd64,linux/arm64"]
- [el8 , "linux/amd64,linux/arm64"]
- [el7 , "linux/amd64,linux/arm64"]
- [amzn2 , "linux/amd64,linux/arm64"]
- [raspbian10 , "linux/arm64"]
- [raspbian9 , "linux/arm64"]
# - [raspbian10 , "linux/arm64"]
# - [raspbian9 , "linux/arm64"]
- [alpine3.15.1, "linux/amd64,linux/arm64"]

steps:
Expand Down Expand Up @@ -108,6 +109,7 @@ jobs:
- [debian11 , "linux/amd64,linux/arm64"]
- [debian10 , "linux/amd64,linux/arm64"]
- [debian9 , "linux/amd64,linux/arm64"]
- [el9 , "linux/amd64,linux/arm64"]
- [el8 , "linux/amd64,linux/arm64"]
- [el7 , "linux/amd64,linux/arm64"]
- [amzn2 , "linux/amd64,linux/arm64"]
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
- [debian11 , "linux/amd64,linux/arm64"]
- [debian10 , "linux/amd64,linux/arm64"]
- [debian9 , "linux/amd64,linux/arm64"]
- [el9 , "linux/amd64,linux/arm64"]
- [el8 , "linux/amd64,linux/arm64"]
- [el7 , "linux/amd64,linux/arm64"]
- [amzn2 , "linux/amd64,linux/arm64"]
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BUILD_FROM=ubuntu:20.04
ARG BUILD_FROM=ubuntu:22.04
FROM ${BUILD_FROM}

ENV EMQX_BUILDER_IMAGE=${BUILD_FROM}
Expand Down
47 changes: 47 additions & 0 deletions el9/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
ARG BUILD_FROM=rockylinux:9
FROM ${BUILD_FROM}

RUN dnf -y update && dnf -y groupinstall development
RUN dnf -y install \
jq \
libatomic \
ncurses-devel \
openssl-devel \
perl-FindBin \
python3-pip \
systemd \
unixODBC \
vim \
wget \
which

RUN dnf -y install \
krb5-workstation \
cyrus-sasl-devel \
cyrus-sasl \
cyrus-sasl-gssapi

# The following is not necessary for Kerberos authentication but makes testing
# https://github.com/kafka4beam/sasl_auth easier
RUN dnf -y install \
krb5-server \
expect

RUN ln -s /usr/bin/python3 /usr/bin/python

WORKDIR /

COPY get-cmake.sh /get-cmake.sh
RUN /get-cmake.sh build

# cleanup
RUN dnf clean all && \
rm -rf /tmp/* && \
rm -rf /var/tmp/*

# Elixir complains if runs without UTF-8
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8

WORKDIR /
CMD [ "/bin/bash" ]
11 changes: 0 additions & 11 deletions prepare-docker.sh

This file was deleted.

0 comments on commit e722d47

Please sign in to comment.