From e5ae68fe43073f1746b477530faeb44609955f98 Mon Sep 17 00:00:00 2001 From: Julius Knorr Date: Sun, 23 Nov 2025 21:09:14 +0100 Subject: [PATCH] fix: One apt install Signed-off-by: Julius Knorr --- docker/Dockerfile.php.template | 29 +++++++++++++++++++++-------- docker/Dockerfile.php71 | 29 +++++++++++++++++++++-------- docker/Dockerfile.php72 | 29 +++++++++++++++++++++-------- docker/Dockerfile.php73 | 29 +++++++++++++++++++++-------- docker/Dockerfile.php74 | 29 +++++++++++++++++++++-------- docker/Dockerfile.php80 | 29 +++++++++++++++++++++-------- docker/Dockerfile.php81 | 29 +++++++++++++++++++++-------- docker/php82/Dockerfile | 29 +++++++++++++++++++++-------- docker/php83/Dockerfile | 29 +++++++++++++++++++++-------- docker/php84/Dockerfile | 29 +++++++++++++++++++++-------- scripts/enable-onlyoffice | 2 ++ 11 files changed, 212 insertions(+), 80 deletions(-) diff --git a/docker/Dockerfile.php.template b/docker/Dockerfile.php.template index 2d4b535..95a7772 100644 --- a/docker/Dockerfile.php.template +++ b/docker/Dockerfile.php.template @@ -27,9 +27,28 @@ RUN install-php-extensions \ blackfire \ @composer +RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ + && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list + # dev tools separate install so we quickly change without rebuilding all php extensions RUN apt update && apt-get install -y --no-install-recommends \ - git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \ + git \ + curl \ + vim \ + nano \ + sudo \ + cron \ + smbclient \ + iproute2 \ + lnav \ + wget \ + iputils-ping \ + gnupg2 \ + jq \ + ripgrep \ + rsync \ + mariadb-client \ + blackfire \ && rm -rf /var/lib/apt/lists/* # Install PHPUnit @@ -63,13 +82,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini # Setup blackfire probe -RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ - && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ - && apt-get update \ - && (apt-get install -y --no-install-recommends blackfire \ - && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ - ) || echo "Skipped blackfire as the installation failed" \ - && rm -rf /var/lib/apt/lists/* +RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf diff --git a/docker/Dockerfile.php71 b/docker/Dockerfile.php71 index bcf2cae..4366a4d 100644 --- a/docker/Dockerfile.php71 +++ b/docker/Dockerfile.php71 @@ -27,9 +27,28 @@ RUN install-php-extensions \ blackfire \ @composer +RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ + && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list + # dev tools separate install so we quickly change without rebuilding all php extensions RUN apt update && apt-get install -y --no-install-recommends \ - git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \ + git \ + curl \ + vim \ + nano \ + sudo \ + cron \ + smbclient \ + iproute2 \ + lnav \ + wget \ + iputils-ping \ + gnupg2 \ + jq \ + ripgrep \ + rsync \ + mariadb-client \ + blackfire \ && rm -rf /var/lib/apt/lists/* # Install PHPUnit @@ -63,13 +82,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini # Setup blackfire probe -RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ - && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ - && apt-get update \ - && (apt-get install -y --no-install-recommends blackfire \ - && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ - ) || echo "Skipped blackfire as the installation failed" \ - && rm -rf /var/lib/apt/lists/* +RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf diff --git a/docker/Dockerfile.php72 b/docker/Dockerfile.php72 index 8bf3499..66f72ac 100644 --- a/docker/Dockerfile.php72 +++ b/docker/Dockerfile.php72 @@ -27,9 +27,28 @@ RUN install-php-extensions \ blackfire \ @composer +RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ + && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list + # dev tools separate install so we quickly change without rebuilding all php extensions RUN apt update && apt-get install -y --no-install-recommends \ - git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \ + git \ + curl \ + vim \ + nano \ + sudo \ + cron \ + smbclient \ + iproute2 \ + lnav \ + wget \ + iputils-ping \ + gnupg2 \ + jq \ + ripgrep \ + rsync \ + mariadb-client \ + blackfire \ && rm -rf /var/lib/apt/lists/* # Install PHPUnit @@ -63,13 +82,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini # Setup blackfire probe -RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ - && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ - && apt-get update \ - && (apt-get install -y --no-install-recommends blackfire \ - && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ - ) || echo "Skipped blackfire as the installation failed" \ - && rm -rf /var/lib/apt/lists/* +RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf diff --git a/docker/Dockerfile.php73 b/docker/Dockerfile.php73 index 5c3bad2..6ae4ad9 100644 --- a/docker/Dockerfile.php73 +++ b/docker/Dockerfile.php73 @@ -27,9 +27,28 @@ RUN install-php-extensions \ blackfire \ @composer +RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ + && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list + # dev tools separate install so we quickly change without rebuilding all php extensions RUN apt update && apt-get install -y --no-install-recommends \ - git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \ + git \ + curl \ + vim \ + nano \ + sudo \ + cron \ + smbclient \ + iproute2 \ + lnav \ + wget \ + iputils-ping \ + gnupg2 \ + jq \ + ripgrep \ + rsync \ + mariadb-client \ + blackfire \ && rm -rf /var/lib/apt/lists/* # Install PHPUnit @@ -63,13 +82,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini # Setup blackfire probe -RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ - && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ - && apt-get update \ - && (apt-get install -y --no-install-recommends blackfire \ - && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ - ) || echo "Skipped blackfire as the installation failed" \ - && rm -rf /var/lib/apt/lists/* +RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf diff --git a/docker/Dockerfile.php74 b/docker/Dockerfile.php74 index 57f1f55..dd67af6 100644 --- a/docker/Dockerfile.php74 +++ b/docker/Dockerfile.php74 @@ -27,9 +27,28 @@ RUN install-php-extensions \ blackfire \ @composer +RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ + && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list + # dev tools separate install so we quickly change without rebuilding all php extensions RUN apt update && apt-get install -y --no-install-recommends \ - git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \ + git \ + curl \ + vim \ + nano \ + sudo \ + cron \ + smbclient \ + iproute2 \ + lnav \ + wget \ + iputils-ping \ + gnupg2 \ + jq \ + ripgrep \ + rsync \ + mariadb-client \ + blackfire \ && rm -rf /var/lib/apt/lists/* # Install PHPUnit @@ -63,13 +82,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini # Setup blackfire probe -RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ - && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ - && apt-get update \ - && (apt-get install -y --no-install-recommends blackfire \ - && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ - ) || echo "Skipped blackfire as the installation failed" \ - && rm -rf /var/lib/apt/lists/* +RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf diff --git a/docker/Dockerfile.php80 b/docker/Dockerfile.php80 index fcd6d5a..c58c34a 100644 --- a/docker/Dockerfile.php80 +++ b/docker/Dockerfile.php80 @@ -27,9 +27,28 @@ RUN install-php-extensions \ blackfire \ @composer +RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ + && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list + # dev tools separate install so we quickly change without rebuilding all php extensions RUN apt update && apt-get install -y --no-install-recommends \ - git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \ + git \ + curl \ + vim \ + nano \ + sudo \ + cron \ + smbclient \ + iproute2 \ + lnav \ + wget \ + iputils-ping \ + gnupg2 \ + jq \ + ripgrep \ + rsync \ + mariadb-client \ + blackfire \ && rm -rf /var/lib/apt/lists/* # Install PHPUnit @@ -63,13 +82,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini # Setup blackfire probe -RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ - && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ - && apt-get update \ - && (apt-get install -y --no-install-recommends blackfire \ - && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ - ) || echo "Skipped blackfire as the installation failed" \ - && rm -rf /var/lib/apt/lists/* +RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf diff --git a/docker/Dockerfile.php81 b/docker/Dockerfile.php81 index 1bed3c7..ec0a516 100644 --- a/docker/Dockerfile.php81 +++ b/docker/Dockerfile.php81 @@ -27,9 +27,28 @@ RUN install-php-extensions \ blackfire \ @composer +RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ + && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list + # dev tools separate install so we quickly change without rebuilding all php extensions RUN apt update && apt-get install -y --no-install-recommends \ - git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \ + git \ + curl \ + vim \ + nano \ + sudo \ + cron \ + smbclient \ + iproute2 \ + lnav \ + wget \ + iputils-ping \ + gnupg2 \ + jq \ + ripgrep \ + rsync \ + mariadb-client \ + blackfire \ && rm -rf /var/lib/apt/lists/* # Install PHPUnit @@ -63,13 +82,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini # Setup blackfire probe -RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ - && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ - && apt-get update \ - && (apt-get install -y --no-install-recommends blackfire \ - && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ - ) || echo "Skipped blackfire as the installation failed" \ - && rm -rf /var/lib/apt/lists/* +RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf diff --git a/docker/php82/Dockerfile b/docker/php82/Dockerfile index 2d4b535..95a7772 100644 --- a/docker/php82/Dockerfile +++ b/docker/php82/Dockerfile @@ -27,9 +27,28 @@ RUN install-php-extensions \ blackfire \ @composer +RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ + && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list + # dev tools separate install so we quickly change without rebuilding all php extensions RUN apt update && apt-get install -y --no-install-recommends \ - git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \ + git \ + curl \ + vim \ + nano \ + sudo \ + cron \ + smbclient \ + iproute2 \ + lnav \ + wget \ + iputils-ping \ + gnupg2 \ + jq \ + ripgrep \ + rsync \ + mariadb-client \ + blackfire \ && rm -rf /var/lib/apt/lists/* # Install PHPUnit @@ -63,13 +82,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini # Setup blackfire probe -RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ - && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ - && apt-get update \ - && (apt-get install -y --no-install-recommends blackfire \ - && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ - ) || echo "Skipped blackfire as the installation failed" \ - && rm -rf /var/lib/apt/lists/* +RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf diff --git a/docker/php83/Dockerfile b/docker/php83/Dockerfile index a36f93a..951517c 100644 --- a/docker/php83/Dockerfile +++ b/docker/php83/Dockerfile @@ -27,9 +27,28 @@ RUN install-php-extensions \ blackfire \ @composer +RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ + && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list + # dev tools separate install so we quickly change without rebuilding all php extensions RUN apt update && apt-get install -y --no-install-recommends \ - git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \ + git \ + curl \ + vim \ + nano \ + sudo \ + cron \ + smbclient \ + iproute2 \ + lnav \ + wget \ + iputils-ping \ + gnupg2 \ + jq \ + ripgrep \ + rsync \ + mariadb-client \ + blackfire \ && rm -rf /var/lib/apt/lists/* # Install PHPUnit @@ -63,13 +82,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini # Setup blackfire probe -RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ - && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ - && apt-get update \ - && (apt-get install -y --no-install-recommends blackfire \ - && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ - ) || echo "Skipped blackfire as the installation failed" \ - && rm -rf /var/lib/apt/lists/* +RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf diff --git a/docker/php84/Dockerfile b/docker/php84/Dockerfile index 83b9e31..491874d 100644 --- a/docker/php84/Dockerfile +++ b/docker/php84/Dockerfile @@ -27,9 +27,28 @@ RUN install-php-extensions \ blackfire \ @composer +RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ + && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list + # dev tools separate install so we quickly change without rebuilding all php extensions RUN apt update && apt-get install -y --no-install-recommends \ - git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \ + git \ + curl \ + vim \ + nano \ + sudo \ + cron \ + smbclient \ + iproute2 \ + lnav \ + wget \ + iputils-ping \ + gnupg2 \ + jq \ + ripgrep \ + rsync \ + mariadb-client \ + blackfire \ && rm -rf /var/lib/apt/lists/* # Install PHPUnit @@ -63,13 +82,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini # Setup blackfire probe -RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ - && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ - && apt-get update \ - && (apt-get install -y --no-install-recommends blackfire \ - && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ - ) || echo "Skipped blackfire as the installation failed" \ - && rm -rf /var/lib/apt/lists/* +RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf diff --git a/scripts/enable-onlyoffice b/scripts/enable-onlyoffice index c62e35c..76fa046 100755 --- a/scripts/enable-onlyoffice +++ b/scripts/enable-onlyoffice @@ -29,3 +29,5 @@ occ onlyoffice:documentserver --check docker_compose exec onlyoffice /var/www/onlyoffice/documentserver/npm/json -f /etc/onlyoffice/documentserver/local.json 'services.CoAuthoring.secret.session.string' + +docker_compose exec onlyoffice supervisorctl start ds:example