Skip to content

Commit e71637f

Browse files
teutat3steutat3s
authored
Merge pull request #1 from mnx-solutions/fix-build-ancient-openssl
Fix build for ancient openssl on Ubuntu 14.04, Ubuntu 16.04, CentOS 7
2 parents 9055170 + 9c2edfb commit e71637f

16 files changed

+315
-42
lines changed

‎.github/workflows/bonsai-rebuild.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# https://discourse.sensu.io/t/heads-up-new-feature-in-bonsai-for-asset-developers/2866
2+
name: Bonsai Request Rebuild
3+
4+
on:
5+
workflow_run:
6+
workflows:
7+
- svenstaro/upload-release-action
8+
types:
9+
- completed
10+
11+
jobs:
12+
bonsai-build:
13+
runs-on: ubuntu-latest
14+
if: ${{ github.event.workflow_run.conclusion == 'success' }}
15+
steps:
16+
- name: request bonsai rebuild
17+
run: >
18+
curl -v -XPOST
19+
-H "X-GitHub-Token: ${{ secrets.BONSAI_GITHUB_TOKEN }}"
20+
--url "https://bonsai.sensu.io/assets/${{ github.repository }}/build"

‎Dockerfile.alpine‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ ADD create-sensu-asset /usr/bin/create-sensu-asset
99
WORKDIR /
1010

1111
RUN apk --update add bash coreutils libintl gettext gettext-dev curl gcc g++ make openssl-dev net-snmp-tools linux-headers procps && \
12-
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.3.tar.gz && \
13-
tar xzf monitoring-plugins-2.3.3.tar.gz && \
14-
cd monitoring-plugins-2.3.3 && \
12+
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.5.tar.gz && \
13+
tar xzf monitoring-plugins-2.3.5.tar.gz && \
14+
cd monitoring-plugins-2.3.5 && \
1515
./configure --prefix=/usr --libexecdir=/usr/lib/monitoring-plugins && \
1616
make && \
1717
make install

‎Dockerfile.amazon2‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ ARG SENSU_GO_ASSET_VERSION="2.11.0"
55
ARG PLUGINS="check_http"
66

77
ADD create-sensu-asset /usr/bin/create-sensu-asset
8+
ADD revert-pr-1868-for-ancient-openssl.patch /revert-pr-1868-for-ancient-openssl.patch
89

910
WORKDIR /
1011

1112
RUN yum groupinstall -y "Development Tools" && \
1213
yum install -y curl expat-devel openssl openssl-devel net-snmp-utils bind-utils which procps && \
13-
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.3.tar.gz && \
14-
tar xzf monitoring-plugins-2.3.3.tar.gz && \
15-
cd monitoring-plugins-2.3.3 && \
14+
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.5.tar.gz && \
15+
tar xzf monitoring-plugins-2.3.5.tar.gz && \
16+
cd monitoring-plugins-2.3.5 && \
1617
./configure --prefix=/usr --libexecdir=/usr/lib/monitoring-plugins && \
18+
patch -R -p1 <../revert-pr-1868-for-ancient-openssl.patch && \
1719
make && \
1820
make install
1921

‎Dockerfile.amazon2023‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ WORKDIR /
1010

1111
RUN yum groupinstall -y "Development Tools" && \
1212
yum install -y expat-devel openssl openssl-devel net-snmp-utils bind-utils which procps && \
13-
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.3.tar.gz && \
14-
tar xzf monitoring-plugins-2.3.3.tar.gz && \
15-
cd monitoring-plugins-2.3.3 && \
13+
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.5.tar.gz && \
14+
tar xzf monitoring-plugins-2.3.5.tar.gz && \
15+
cd monitoring-plugins-2.3.5 && \
1616
./configure --prefix=/usr --libexecdir=/usr/lib/monitoring-plugins && \
1717
make && \
1818
make install

‎Dockerfile.centos7‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ ARG SENSU_GO_ASSET_VERSION="2.11.0"
55
ARG PLUGINS="check_http"
66

77
ADD create-sensu-asset /usr/bin/create-sensu-asset
8+
ADD revert-pr-1868-for-ancient-openssl.patch /revert-pr-1868-for-ancient-openssl.patch
89

910
WORKDIR /
1011

1112
RUN yum groupinstall -y "Development Tools" && \
1213
yum install -y curl expat-devel openssl openssl-devel net-snmp-utils bind-utils which procps && \
13-
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.3.tar.gz && \
14-
tar xzf monitoring-plugins-2.3.3.tar.gz && \
15-
cd monitoring-plugins-2.3.3 && \
14+
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.5.tar.gz && \
15+
tar xzf monitoring-plugins-2.3.5.tar.gz && \
16+
cd monitoring-plugins-2.3.5 && \
1617
./configure --prefix=/usr --libexecdir=/usr/lib/monitoring-plugins && \
18+
patch -R -p1 <../revert-pr-1868-for-ancient-openssl.patch && \
1719
make && \
1820
make install
1921

‎Dockerfile.centos8‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ RUN dnf -y distro-sync
1414
RUN dnf -y upgrade && \
1515
dnf groupinstall -y "Development Tools" && \
1616
dnf install -y curl expat-devel openssl openssl-devel net-snmp-utils bind-utils which procps && \
17-
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.3.tar.gz && \
18-
tar xzf monitoring-plugins-2.3.3.tar.gz && \
19-
cd monitoring-plugins-2.3.3 && \
17+
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.5.tar.gz && \
18+
tar xzf monitoring-plugins-2.3.5.tar.gz && \
19+
cd monitoring-plugins-2.3.5 && \
2020
./configure --prefix=/usr --libexecdir=/usr/lib/monitoring-plugins && \
2121
make && \
2222
make install

‎Dockerfile.debian10‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ WORKDIR /
1010

1111
RUN apt-get update && \
1212
apt-get install -y build-essential curl libexpat1-dev openssl libssl-dev libz-dev snmp dnsutils procps iputils-ping && \
13-
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.3.tar.gz && \
14-
tar xzf monitoring-plugins-2.3.3.tar.gz && \
15-
cd monitoring-plugins-2.3.3 && \
13+
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.5.tar.gz && \
14+
tar xzf monitoring-plugins-2.3.5.tar.gz && \
15+
cd monitoring-plugins-2.3.5 && \
1616
./configure --prefix=/usr --libexecdir=/usr/lib/monitoring-plugins && \
1717
make && \
1818
make install

‎Dockerfile.debian11‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ WORKDIR /
1010

1111
RUN apt-get update && \
1212
apt-get install -y build-essential curl libexpat1-dev openssl libssl-dev libz-dev snmp dnsutils procps iputils-ping && \
13-
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.3.tar.gz && \
14-
tar xzf monitoring-plugins-2.3.3.tar.gz && \
15-
cd monitoring-plugins-2.3.3 && \
13+
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.5.tar.gz && \
14+
tar xzf monitoring-plugins-2.3.5.tar.gz && \
15+
cd monitoring-plugins-2.3.5 && \
1616
./configure --prefix=/usr --libexecdir=/usr/lib/monitoring-plugins && \
1717
make && \
1818
make install

‎Dockerfile.raspberrypi64‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ WORKDIR /
1010

1111
RUN apt-get update && \
1212
apt-get install -y build-essential curl libexpat1-dev openssl libssl-dev libz-dev snmp dnsutils procps iputils-ping gcc-aarch64-linux-gnu && \
13-
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.3.tar.gz && \
14-
tar xzf monitoring-plugins-2.3.3.tar.gz && \
15-
cd monitoring-plugins-2.3.3 && \
13+
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.5.tar.gz && \
14+
tar xzf monitoring-plugins-2.3.5.tar.gz && \
15+
cd monitoring-plugins-2.3.5 && \
1616
./configure --host=arm-elf-linux CC=aarch64-linux-gnu-gcc --prefix=/usr --libexecdir=/usr/lib/monitoring-plugins && \
1717
make && \
1818
make install

‎Dockerfile.rocky9‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ RUN dnf -y distro-sync
1414
RUN dnf -y upgrade && \
1515
dnf groupinstall -y "Development Tools" && \
1616
dnf install -y --allowerasing curl expat-devel openssl openssl-devel net-snmp-utils bind-utils which procps iputils && \
17-
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.3.tar.gz && \
18-
tar xzf monitoring-plugins-2.3.3.tar.gz && \
19-
cd monitoring-plugins-2.3.3 && \
17+
curl -s -L -O https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.5.tar.gz && \
18+
tar xzf monitoring-plugins-2.3.5.tar.gz && \
19+
cd monitoring-plugins-2.3.5 && \
2020
./configure --prefix=/usr --libexecdir=/usr/lib/monitoring-plugins && \
2121
make && \
2222
make install

0 commit comments

Comments
 (0)