diff --git a/action.Dockerfile b/action.Dockerfile index b1a762b..3194ef0 100644 --- a/action.Dockerfile +++ b/action.Dockerfile @@ -1,5 +1,5 @@ FROM icinga/icinga2-builder -COPY action.bash Dockerfile / +COPY action.bash compile.bash Dockerfile / CMD ["/action.bash"] diff --git a/action.bash b/action.bash index 42070b9..c445067 100755 --- a/action.bash +++ b/action.bash @@ -15,26 +15,10 @@ mkimg () { node /actions/checkout/dist/index.js |grep -vFe ::add-matcher:: cache restore - export PATH="/usr/lib/ccache:$PATH" mkdir -p ccache ln -vs "$(pwd)/ccache" ~/.ccache - mkdir icinga2-bin - mkdir build - cd build - - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc \ - -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run \ - -DICINGA2_SYSCONFIGFILE=/etc/sysconfig/icinga2 -DICINGA2_WITH_{COMPAT,LIVESTATUS}=OFF .. - - make - make test - - make install "DESTDIR=$(pwd)/../icinga2-bin" - - cd .. - - rm icinga2-bin/etc/icinga2/features-enabled/mainlog.conf + /compile.bash cache save docker build -f /Dockerfile -t "${TARGET}:$TAG" . diff --git a/compile.bash b/compile.bash new file mode 100755 index 0000000..b1e05bd --- /dev/null +++ b/compile.bash @@ -0,0 +1,21 @@ +#!/bin/bash +set -exo pipefail + +export PATH="/usr/lib/ccache:$PATH" + +mkdir icinga2-bin +mkdir build +cd build + +cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run \ + -DICINGA2_SYSCONFIGFILE=/etc/sysconfig/icinga2 -DICINGA2_WITH_{COMPAT,LIVESTATUS}=OFF .. + +make +make test + +make install "DESTDIR=$(pwd)/../icinga2-bin" + +cd .. + +rm icinga2-bin/etc/icinga2/features-enabled/mainlog.conf