diff --git a/Dockerfile b/Dockerfile index 1ee6d1b..0a88ee8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,10 @@ RUN \ SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ + apk add --no-cache --virtual=build-dependencies \ + build-base \ + perl-app-cpanminus \ + perl-dev && \ apk add --no-cache \ apache2 \ apache2-ctl \ @@ -30,12 +34,16 @@ RUN \ ssmtp \ sudo \ tcptraceroute && \ + echo "**** Build perl TacacsPlus module ****" && \ + cpanm Authen::TacacsPlus && \ echo "**** give setuid access to traceroute & tcptraceroute ****" && \ chmod a+s /usr/bin/traceroute && \ chmod a+s /usr/bin/tcptraceroute && \ echo "**** fix path to cropper.js ****" && \ sed -i 's#src="/cropper/#/src="cropper/#' /etc/smokeping/basepage.html && \ - echo "**** remove default apache conf ****" && \ + echo "**** Cleanup ****" && \ + apk del --purge \ + build-dependencies && \ rm -rf \ /tmp/* \ /etc/apache2/httpd.conf diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6f3c689..2fc50e8 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -15,6 +15,10 @@ RUN \ SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ + apk add --no-cache --virtual=build-dependencies \ + build-base \ + perl-app-cpanminus \ + perl-dev && \ apk add --no-cache \ apache2 \ apache2-ctl \ @@ -30,12 +34,16 @@ RUN \ ssmtp \ sudo \ tcptraceroute && \ + echo "**** Build perl TacacsPlus module ****" && \ + cpanm Authen::TacacsPlus && \ echo "**** give setuid access to traceroute & tcptraceroute ****" && \ chmod a+s /usr/bin/traceroute && \ chmod a+s /usr/bin/tcptraceroute && \ echo "**** fix path to cropper.js ****" && \ sed -i 's#src="/cropper/#/src="cropper/#' /etc/smokeping/basepage.html && \ - echo "**** remove default apache conf ****" && \ + echo "**** Cleanup ****" && \ + apk del --purge \ + build-dependencies && \ rm -rf \ /tmp/* \ /etc/apache2/httpd.conf diff --git a/README.md b/README.md index d6e4891..1848b9e 100644 --- a/README.md +++ b/README.md @@ -227,6 +227,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.07.23:** - Add Authen::TacacsPlus for Tacacs+ support. * **16.05.23:** - Add perl-authen-radius for Radius support. * **16.05.23:** - Rebase to Alpine 3.18. Deprecate armhf. * **11.05.23:** - Add perl-lwp-protocol-https for master/slave support over https. diff --git a/readme-vars.yml b/readme-vars.yml index ea70bb0..3f07624 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -34,6 +34,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.07.23:", desc: "Add Authen::TacacsPlus for Tacacs+ support." } - { date: "16.05.23:", desc: "Add perl-authen-radius for Radius support." } - { date: "16.05.23:", desc: "Rebase to Alpine 3.18. Deprecate armhf." } - { date: "11.05.23:", desc: "Add perl-lwp-protocol-https for master/slave support over https." }