mirror of
https://github.com/Icinga/docker-icingaweb2.git
synced 2025-08-07 14:57:19 +02:00
Add Icinga-stuff to PHP include path
so that non-Icinga-stuff, e.g. PHPUnit, can reach Icinga-stuff.
This commit is contained in:
parent
de1b0c8438
commit
c76c67aa83
@ -35,6 +35,7 @@ ENTRYPOINT ["/entrypoint"]
|
|||||||
|
|
||||||
COPY icingaweb2 /usr/share/icingaweb2
|
COPY icingaweb2 /usr/share/icingaweb2
|
||||||
COPY icinga-php /usr/share/icinga-php
|
COPY icinga-php /usr/share/icinga-php
|
||||||
|
COPY php.ini /etc/php/7.4/cli/conf.d/99-docker.ini
|
||||||
|
|
||||||
RUN ["ln", "-vs", "/usr/share/icingaweb2/packages/files/apache/icingaweb2.conf", "/etc/apache2/conf-enabled/"]
|
RUN ["ln", "-vs", "/usr/share/icingaweb2/packages/files/apache/icingaweb2.conf", "/etc/apache2/conf-enabled/"]
|
||||||
RUN ["ln", "-vs", "/usr/share/icingaweb2/bin/icingacli", "/usr/local/bin/"]
|
RUN ["ln", "-vs", "/usr/share/icingaweb2/bin/icingacli", "/usr/local/bin/"]
|
||||||
|
@ -33,7 +33,7 @@ RUN apt-get update ;\
|
|||||||
|
|
||||||
COPY --from=clone /actions /actions
|
COPY --from=clone /actions /actions
|
||||||
|
|
||||||
COPY action.bash composer.bash Dockerfile get-mods.sh icingaweb2.patch /
|
COPY action.bash composer.bash Dockerfile get-mods.sh icingaweb2.patch php.ini /
|
||||||
COPY entrypoint /entrypoint
|
COPY entrypoint /entrypoint
|
||||||
|
|
||||||
CMD ["/action.bash"]
|
CMD ["/action.bash"]
|
||||||
|
@ -16,7 +16,7 @@ mkimg () {
|
|||||||
/composer.bash
|
/composer.bash
|
||||||
patch -d icingaweb2 -p0 < /icingaweb2.patch
|
patch -d icingaweb2 -p0 < /icingaweb2.patch
|
||||||
|
|
||||||
cp -r /entrypoint .
|
cp -r /entrypoint /php.ini .
|
||||||
docker build -f /Dockerfile -t "${TARGET}:$TAG" .
|
docker build -f /Dockerfile -t "${TARGET}:$TAG" .
|
||||||
|
|
||||||
STATE_isPost=1 node /actions/checkout/dist/index.js
|
STATE_isPost=1 node /actions/checkout/dist/index.js
|
||||||
|
@ -33,6 +33,6 @@ cd /iw2cp
|
|||||||
/bldctx/composer.bash
|
/bldctx/composer.bash
|
||||||
patch -d icingaweb2 -p0 < /bldctx/icingaweb2.patch
|
patch -d icingaweb2 -p0 < /bldctx/icingaweb2.patch
|
||||||
|
|
||||||
cp -r /entrypoint .
|
cp -r /entrypoint /bldctx/php.ini .
|
||||||
docker build -f /bldctx/Dockerfile -t icinga/icingaweb2 .
|
docker build -f /bldctx/Dockerfile -t icinga/icingaweb2 .
|
||||||
EOF
|
EOF
|
||||||
|
Loading…
Reference in New Issue
Block a user