Docker Library Bot 1 rok pred
rodič
commit
6e2361f9b9
2 zmenil súbory, kde vykonal 19 pridanie a 18 odobranie
  1. 11 10
      matomo/README.md
  2. 8 8
      oraclelinux/README.md

+ 11 - 10
matomo/README.md

@@ -63,7 +63,7 @@ WARNING:
 
 You can run the Matomo container and service like so:
 
-```console
+```bash
 docker run -d --link some-mysql:db matomo
 ```
 
@@ -73,8 +73,8 @@ This assumes you've already launched a suitable MySQL or MariaDB database contai
 
 Use a Docker volume to keep persistent data:
 
-```console
-docker run -d --link some-mysql:db -v matomo:/var/www/html matomo
+```bash
+docker run -d -p 8080:80 --link some-mysql:db -v matomo:/var/www/html matomo
 ```
 
 ## Matomo Installation
@@ -99,28 +99,29 @@ The following environment variables are also honored for configuring your Matomo
 -	`MATOMO_DATABASE_PASSWORD`
 -	`MATOMO_DATABASE_DBNAME`
 
+The PHP memory limit can be configured with the following environment variable:
+
+-	`PHP_MEMORY_LIMIT`
+
 ## Docker-compose examples and log import instructions
 
 A minimal set-up using docker-compose is available in the [.examples folder](https://github.com/matomo-org/docker/tree/master/.examples).
 
 If you want to use the import logs script, you can then run the following container as needed, in order to execute the python import logs script:
 
-```console
-docker run --rm --volumes-from="matomo_app_1" --link matomo_app_1 python:2-alpine python /var/www/html/misc/log-analytics/import_logs.py --url=http://ip.of.your.piwik --login=yourlogin --password=yourpassword --idsite=1 --recorders=4 /var/www/html/logs/access.log
+```bash
+docker run --rm --volumes-from="matomo-app-1" --link matomo-app-1 python:3-alpine python /var/www/html/misc/log-analytics/import_logs.py --url=http://ip.of.your.matomo.example --login=yourlogin --password=yourpassword --idsite=1 --recorders=4 /var/www/html/logs/access.log
 ```
 
 ## Contribute
 
 Pull requests are very welcome!
 
-We'd love to hear your feedback and suggestions in the issue tracker: [github.com/motomo-org/docker/issues](https://github.com/matomo-org/docker/issues).
+We'd love to hear your feedback and suggestions in the issue tracker: [[https://github.com/matomo-org/docker/issues](https://github.com/matomo-org/docker/issues?q=)]([https://github.com/matomo-org/docker/issues](https://github.com/matomo-org/docker/issues?q=)).
 
 ## GeoIP
 
-~~This product includes GeoLite data created by MaxMind, available from [http://www.maxmind.com](http://www.maxmind.com).~~
-
--	https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/
--	https://matomo.org/faq/how-to/faq_163/
+~~This product includes GeoLite data created by MaxMind, available from [https://www.maxmind.com](https://www.maxmind.com).~~ https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/
 
 # Image Variants
 

+ 8 - 8
oraclelinux/README.md

@@ -24,14 +24,14 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`9`](https://github.com/oracle/container-images/blob/5874902983c0098d8adc187cd905e83f196c9c5d/9/Dockerfile)
--	[`9-slim`](https://github.com/oracle/container-images/blob/5874902983c0098d8adc187cd905e83f196c9c5d/9-slim/Dockerfile)
--	[`8.9`, `8`](https://github.com/oracle/container-images/blob/5874902983c0098d8adc187cd905e83f196c9c5d/8/Dockerfile)
--	[`8-slim`](https://github.com/oracle/container-images/blob/5874902983c0098d8adc187cd905e83f196c9c5d/8-slim/Dockerfile)
--	[`8-slim-fips`](https://github.com/oracle/container-images/blob/5874902983c0098d8adc187cd905e83f196c9c5d/8-slim-fips/Dockerfile)
--	[`7.9`, `7`](https://github.com/oracle/container-images/blob/5874902983c0098d8adc187cd905e83f196c9c5d/7/Dockerfile)
--	[`7-slim`](https://github.com/oracle/container-images/blob/5874902983c0098d8adc187cd905e83f196c9c5d/7-slim/Dockerfile)
--	[`7-slim-fips`](https://github.com/oracle/container-images/blob/5874902983c0098d8adc187cd905e83f196c9c5d/7-slim-fips/Dockerfile)
+-	[`9`](https://github.com/oracle/container-images/blob/f2f581f34293af40bc3376b8e9138c849bdc811f/9/Dockerfile)
+-	[`9-slim`](https://github.com/oracle/container-images/blob/f2f581f34293af40bc3376b8e9138c849bdc811f/9-slim/Dockerfile)
+-	[`8.9`, `8`](https://github.com/oracle/container-images/blob/f2f581f34293af40bc3376b8e9138c849bdc811f/8/Dockerfile)
+-	[`8-slim`](https://github.com/oracle/container-images/blob/f2f581f34293af40bc3376b8e9138c849bdc811f/8-slim/Dockerfile)
+-	[`8-slim-fips`](https://github.com/oracle/container-images/blob/f2f581f34293af40bc3376b8e9138c849bdc811f/8-slim-fips/Dockerfile)
+-	[`7.9`, `7`](https://github.com/oracle/container-images/blob/f2f581f34293af40bc3376b8e9138c849bdc811f/7/Dockerfile)
+-	[`7-slim`](https://github.com/oracle/container-images/blob/f2f581f34293af40bc3376b8e9138c849bdc811f/7-slim/Dockerfile)
+-	[`7-slim-fips`](https://github.com/oracle/container-images/blob/f2f581f34293af40bc3376b8e9138c849bdc811f/7-slim-fips/Dockerfile)
 
 # Quick reference (cont.)