commit b49906031d092c7922c39a44c3bf72ca51692f75 Author: Knut Ahlers Date: Sun Jun 9 12:40:37 2019 +0200 Initial version Signed-off-by: Knut Ahlers diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..376dfff --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +sudo: required + +services: + - docker + +script: + - bash update.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..1607315 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM luzifer/alpine-nginx-php + +ENV MATOMO_VERSION=3.9.0 \ + MATOMO_CHECKSUM=xxx + +COPY rootfs / +RUN set -ex && /usr/local/bin/container-setup diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..2ce1cf5 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2019- Knut Ahlers + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/README.md b/README.md new file mode 100644 index 0000000..613607c --- /dev/null +++ b/README.md @@ -0,0 +1,15 @@ +# luzifer-docker / matomo + +Run matomo in a nginx / php-fpm Docker container using s6 overlay + +**This image contains a TAR of the Matomo source code and will automatically update your installation from that archive. Therefore it is strongly adviced NOT to run on `latest` but to pin the version you want to use. Otherwise your Matomo will update unexpectedly and might break!** + +## Usage + +```bash +## Build container (optional) +$ docker build -t luzifer/matomo . + +## Execute matomo +$ docker run --rm -ti -v $(pwd):/var/www -p 80:80 luzifer/matomo +``` diff --git a/rootfs/etc/cont-init.d/copy-matomo.sh b/rootfs/etc/cont-init.d/copy-matomo.sh new file mode 100755 index 0000000..5fa585e --- /dev/null +++ b/rootfs/etc/cont-init.d/copy-matomo.sh @@ -0,0 +1,16 @@ +#!/usr/bin/with-contenv /bin/bash +set -euo pipefail + +if [[ -f core/Version.php ]]; then + installed_version=$(grep VERSION core/Version.php | sed -E "s/.*'(.*)'.*/\\1/") + if [ -n "${installed_version}" ] && [[ ${installed_version} == ${MATOMO_VERSION} ]]; then + echo "Matomo installation is up-to-date." >&2 + exit 0 + fi +fi + +echo "No Matomo installation found or not up-to-date" >&2 +echo "Installing bundled Matomo version" >&2 + +tar -xvz -C /var/www --strip-components=1 -f /opt/matomo.tgz +chown -R nobody:nogroup /var/www diff --git a/rootfs/etc/php7/conf.d/10_opcache-recommended.ini b/rootfs/etc/php7/conf.d/10_opcache-recommended.ini new file mode 100644 index 0000000..0bb0c1b --- /dev/null +++ b/rootfs/etc/php7/conf.d/10_opcache-recommended.ini @@ -0,0 +1,6 @@ + opcache.memory_consumption=128 + opcache.interned_strings_buffer=8 + opcache.max_accelerated_files=4000 + opcache.revalidate_freq=2 + opcache.fast_shutdown=1 + opcache.enable_cli=1 diff --git a/rootfs/etc/php7/conf.d/error-logging.ini b/rootfs/etc/php7/conf.d/error-logging.ini new file mode 100644 index 0000000..8826fb5 --- /dev/null +++ b/rootfs/etc/php7/conf.d/error-logging.ini @@ -0,0 +1,9 @@ + error_reporting = 4339 + display_errors = Off + display_startup_errors = Off + log_errors = On + error_log = /dev/stderr + log_errors_max_len = 1024 + ignore_repeated_errors = On + ignore_repeated_source = Off + html_errors = Off diff --git a/rootfs/etc/php7/conf.d/matomo.ini b/rootfs/etc/php7/conf.d/matomo.ini new file mode 100644 index 0000000..ce507db --- /dev/null +++ b/rootfs/etc/php7/conf.d/matomo.ini @@ -0,0 +1,2 @@ +always_populate_raw_post_data=-1 +geoip.custom_directory=/var/www/html/misc diff --git a/rootfs/usr/local/bin/container-setup b/rootfs/usr/local/bin/container-setup new file mode 100755 index 0000000..3a58592 --- /dev/null +++ b/rootfs/usr/local/bin/container-setup @@ -0,0 +1,31 @@ +#!/bin/bash +set -euxo pipefail + +url="https://builds.matomo.org/piwik-${MATOMO_VERSION}.tar.gz" +packages=( + php7-dom + php7-gd + php7-iconv + php7-json + php7-ldap + php7-mbstring + php7-mysqli + php7-opcache + php7-pdo_mysql + php7-pecl-apcu + php7-pecl-redis + php7-simplexml + php7-xml + php7-zip +) + +function step() { + echo "$@..." >&2 +} + +step "Downloading matomo release ${MATOMO_VERSION}" +curl -sSfLo /opt/matomo.tgz "${url}" +echo "${MATOMO_CHECKSUM} /opt/matomo.tgz" | sha256sum -c + +step "Installing required packages" +apk --no-cache add "${packages[@]}" diff --git a/update.sh b/update.sh new file mode 100755 index 0000000..62e8d2b --- /dev/null +++ b/update.sh @@ -0,0 +1,35 @@ +#!/bin/bash +set -euo pipefail + +### ---- ### + +echo "Switch back to master" +git checkout master +git reset --hard origin/master + +### ---- ### + +version=$(curl -s "https://lv.luzifer.io/catalog-api/matomo/latest.txt?p=version") +grep -q "MATOMO_VERSION=${version} " Dockerfile && exit 0 || echo "Update required" + +filehash=$(curl -sSfL "https://builds.matomo.org/piwik-${version}.tar.gz" | sha256sum | cut -d ' ' -f 1) + +sed -Ei \ + -e "s/MATOMO_VERSION=[0-9.]+/MATOMO_VERSION=${version}/" \ + -e "s/MATOMO_CHECKSUM=[a-z0-9]+/MATOMO_CHECKSUM=${filehash}/" \ + Dockerfile + +### ---- ### + +echo "Testing build..." +docker build . + +### ---- ### + +echo "Updating repository..." +git add Dockerfile +git -c user.name='Travis Automated Update' -c user.email='travis@luzifer.io' \ + commit -m "Matomo ${version}" +git tag ${version} + +git push -q https://${GH_USER}:${GH_TOKEN}@github.com/luzifer-docker/matomo master --tags