Skip to content

Commit

Permalink
Merge pull request #89 from emqx/0710-support-debian12
Browse files Browse the repository at this point in the history
feat: add debian12 support
  • Loading branch information
id authored Jul 10, 2023
2 parents f673db7 + c61a276 commit a318778
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 20 deletions.
1 change: 1 addition & 0 deletions .github/workflows/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
- [ubuntu20.04 , "linux/amd64,linux/arm64"]
- [ubuntu18.04 , "linux/amd64,linux/arm64"]
- [ubuntu16.04 , "linux/amd64,linux/arm64"]
- [debian12 , "linux/amd64,linux/arm64"]
- [debian11 , "linux/amd64,linux/arm64"]
- [debian10 , "linux/amd64,linux/arm64"]
- [debian9 , "linux/amd64,linux/arm64"]
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:
- [ubuntu20.04 , "linux/amd64,linux/arm64"]
- [ubuntu18.04 , "linux/amd64,linux/arm64"]
- [ubuntu16.04 , "linux/amd64,linux/arm64"]
- [debian12 , "linux/amd64,linux/arm64"]
- [debian11 , "linux/amd64,linux/arm64"]
- [debian10 , "linux/amd64,linux/arm64"]
- [debian9 , "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 @@ -42,6 +42,7 @@ jobs:
- [ubuntu20.04 , "linux/amd64,linux/arm64"]
- [ubuntu18.04 , "linux/amd64,linux/arm64"]
- [ubuntu16.04 , "linux/amd64,linux/arm64"]
- [debian12 , "linux/amd64,linux/arm64"]
- [debian11 , "linux/amd64,linux/arm64"]
- [debian10 , "linux/amd64,linux/arm64"]
- [debian9 , "linux/amd64,linux/arm64"]
Expand Down
55 changes: 55 additions & 0 deletions debian12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
ARG BUILD_FROM=debian:12
FROM ${BUILD_FROM}

# Avoid getting asked questions during installation (tzdata)
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get install -y \
autoconf \
automake \
autotools-dev \
bison \
build-essential \
cmake \
curl \
debhelper \
expect \
flex \
git \
jq \
krb5-admin-server \
krb5-kdc \
libffi-dev \
libkrb5-3 \
libkrb5-dev \
libncurses5-dev \
libsasl2-2 \
libsasl2-dev \
libsasl2-modules-gssapi-mit \
libssl-dev \
libtool \
procps \
python3 \
python3-pip \
unixodbc \
unixodbc-dev \
unzip \
vim \
wget \
zip \
zlib1g-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

RUN ln -sf /usr/bin/python3 /usr/bin/python && \
ln -sf /usr/bin/pip3 /usr/bin/pip

RUN cmake --version

WORKDIR /

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

CMD [ "/bin/bash" ]
30 changes: 10 additions & 20 deletions ubuntu22.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ RUN apt-get update && apt-get install -y \
cmake \
curl \
debhelper \
expect \
flex \
g++ \
gcc \
git \
inotify-tools \
jq \
krb5-admin-server \
krb5-kdc \
libffi-dev \
libkrb5-3 \
libkrb5-dev \
Expand All @@ -29,37 +30,26 @@ RUN apt-get update && apt-get install -y \
libsasl2-modules-gssapi-mit \
libssl-dev \
libtool \
make \
python3 \
python3-pip \
software-properties-common \
unixodbc \
unixodbc-dev \
unzip \
vim \
wget \
zip \
zlib1g-dev

# The following is not necessary for Kerberos authentication but makes testing
# https://github.com/kafka4beam/sasl_auth easier
RUN apt-get install -y \
krb5-kdc \
krb5-admin-server \
expect
zlib1g-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

RUN ln -sf /usr/bin/python3 /usr/bin/python
RUN ln -sf /usr/bin/pip3 /usr/bin/pip
RUN ln -sf /usr/bin/python3 /usr/bin/python && \
ln -sf /usr/bin/pip3 /usr/bin/pip

RUN cmake --version

RUN apt-get update && apt-get install -y unixodbc unixodbc-dev

WORKDIR /


# cleanup
RUN apt-get clean\
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

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

0 comments on commit a318778

Please sign in to comment.