Merge branch 'release/3.2.0'

svanschu · Oct 9, 2020 · 06b88dd · 06b88dd
2 parents b20f95f + 35f1a07
commit 06b88dd
Show file tree

Hide file tree

Showing 38 changed files with 715 additions and 141 deletions.
diff --git a/.docker/Makefile b/.docker/Makefile
@@ -0,0 +1,22 @@
+sitemap-dev-php74-up:
+	sudo docker-compose -f sitemap-dev-php7.4/docker-compose.yml up -d
+sitemap-dev-php74-stop:
+	sudo docker-compose -f sitemap-dev-php7.4/docker-compose.yml stop
+sitemap-dev-php74-install:
+	sudo ln -sf /src/administrator/components/com_schuweb_sitemap ${CURDIR}/sitemap-dev-php7.4/public/administrator/components/
+	sudo ln -sf /src/administrator/components/com_schuweb_sitemap/language/en-GB/en-GB.com_schuweb_sitemap.ini ${CURDIR}/sitemap-dev-php7.4/public/administrator/language/en-GB/
+	sudo ln -sf /src/administrator/components/com_schuweb_sitemap/language/en-GB/en-GB.com_schuweb_sitemap.sys.ini ${CURDIR}/sitemap-dev-php7.4/public/administrator/language/en-GB/
+	sudo ln -sf /src/components/com_schuweb_sitemap ${CURDIR}/sitemap-dev-php7.4/public/components/
+	sudo ln -sf /src/components/com_schuweb_sitemap/language/en-GB/en-GB.com_schuweb_sitemap.ini ${CURDIR}/sitemap-dev-php7.4/public/language/en-GB/
+	sudo ln -sf /src/components/com_schuweb_sitemap/language/en-GB/en-GB.com_schuweb_sitemap.sys.ini ${CURDIR}/sitemap-dev-php7.4/public/language/en-GB/
+	sudo ln -sf /src/plugins/schuweb_sitemap ${CURDIR}/sitemap-dev-php7.4/public/plugins/
+	sudo ln -sf /src/plugins/schuweb_sitemap/com_content/language/en-GB.plg_schuweb_sitemap_com_content.ini ${CURDIR}/sitemap-dev-php7.4/public/administrator/language/en-GB/
+	sudo ln -sf /src/plugins/schuweb_sitemap/com_k2/language/en-GB.plg_schuweb_sitemap_com_k2.ini ${CURDIR}/sitemap-dev-php7.4/public/administrator/language/en-GB/
+	sudo ln -sf /src/plugins/schuweb_sitemap/com_kunena/language/en-GB.plg_schuweb_sitemap_com_kunena.ini ${CURDIR}/sitemap-dev-php7.4/public/administrator/language/en-GB/
+	sudo ln -sf /src/plugins/schuweb_sitemap/com_sobipro/language/en-GB.plg_schuweb_sitemap_com_sobipro.ini ${CURDIR}/sitemap-dev-php7.4/public/administrator/language/en-GB/
+	sudo ln -sf /src/plugins/schuweb_sitemap/com_virtuemart/language/en-GB.plg_schuweb_sitemap_com_virtuemart.ini ${CURDIR}/sitemap-dev-php7.4/public/administrator/language/en-GB/
+	sudo ln -sf /src/plugins/schuweb_sitemap/com_weblinks/language/en-GB.plg_schuweb_sitemap_com_weblinks.ini ${CURDIR}/sitemap-dev-php7.4/public/administrator/language/en-GB/
+updateTest-php7.4-up:
+	sudo docker-compose -f updateTest-php7.4/docker-compose.yml up -d
+updateTest-php7.4-stop:
+	sudo docker-compose -f updateTest-php7.4/docker-compose.yml stop
diff --git a/.docker/sitemap-dev-php7.4/docker-compose.yml b/.docker/sitemap-dev-php7.4/docker-compose.yml
@@ -0,0 +1,40 @@
+###############################################################################
+#                          Generated on phpdocker.io                          #
+###############################################################################
+version: "3.1"
+services:
+
+    mariadb:
+      image: mariadb:5.5
+      container_name: sitemap-dev-mariadb
+      working_dir: /application
+      volumes:
+        - .:/application
+        - ./db:/var/lib/mysql
+      environment:
+        - MYSQL_ROOT_PASSWORD=sitemap
+        - MYSQL_DATABASE=sitemap
+        - MYSQL_USER=sitemap
+        - MYSQL_PASSWORD=sitemap
+      ports:
+        - "5558:3306"
+
+    webserver:
+      image: nginx:alpine
+      container_name: sitemap-dev-webserver
+      working_dir: /application
+      volumes:
+          - .:/application
+          - ./phpdocker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf
+      ports:
+       - "5555:80"
+
+    php-fpm:
+      build: phpdocker/php-fpm
+      container_name: sitemap-dev-php-fpm
+      working_dir: /application
+      volumes:
+        - .:/application
+        - ./../..:/src
+        - ./phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini
+
diff --git a/.docker/sitemap-dev-php7.4/phpdocker/README.html b/.docker/sitemap-dev-php7.4/phpdocker/README.html
@@ -0,0 +1,125 @@
+<html>
+<head>
+    <title>PHPDocker.io Readme</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/pure/0.6.0/pure-min.css">
+
+    <style>
+        code {
+            background-color : #ddd;
+            padding          : 2px 5px;
+            font-family      : monospace;
+            font-size        : 16px;
+        }
+    </style>
+</head>
+<body>
+
+<div class="pure-g">
+    <div class="pure-u-1-24"></div>
+    <div class="pure-u-22-24">
+        <h1>PHPDocker.io generated environment</h1>
+
+<h1>Add to your project</h1>
+
+<p>Simply, unzip the file into your project, this will create <code>docker-compose.yml</code> on the root of your project and a folder named <code>phpdocker</code> containing nginx and php-fpm config for it.</p>
+
+<p>Ensure the webserver config on <code>phpdocker/nginx/nginx.conf</code> is correct for your project. PHPDocker.io will have customised this file according to the application type you chose on the generator, for instance <code>web/app|app_dev.php</code> on a Symfony project, or <code>public/index.php</code> on generic apps.</p>
+
+<p>Note: you may place the files elsewhere in your project. Make sure you modify the locations for the php-fpm dockerfile, the php.ini overrides and nginx config on <code>docker-compose.yml</code> if you do so.</p>
+
+<h1>How to run</h1>
+
+<p>Dependencies:</p>
+
+<ul>
+<li>Docker engine v1.13 or higher. Your OS provided package might be a little old, if you encounter problems, do upgrade. See <a href="https://docs.docker.com/engine/installation">https://docs.docker.com/engine/installation</a></li>
+<li>Docker compose v1.12 or higher. See <a href="https://docs.docker.com/compose/install/">docs.docker.com/compose/install</a></li>
+</ul>
+
+<p>Once you're done, simply <code>cd</code> to your project and run <code>docker-compose up -d</code>. This will initialise and start all the containers, then leave them running in the background.</p>
+
+<h2>Services exposed outside your environment</h2>
+
+<p>You can access your application via <strong><code>localhost</code></strong>, if you're running the containers directly, or through <strong>``</strong> when run on a vm. nginx and mailhog both respond to any hostname, in case you want to add your own hostname on your <code>/etc/hosts</code></p>
+
+<table>
+<thead>
+<tr>
+  <th>Service</th>
+  <th>Address outside containers</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td>Webserver</td>
+  <td><a href="http://localhost:5555">localhost:5555</a></td>
+</tr>
+<tr>
+  <td>MariaDB</td>
+  <td><strong>host:</strong> <code>localhost</code>; <strong>port:</strong> <code>5558</code></td>
+</tr>
+</tbody>
+</table>
+
+<h2>Hosts within your environment</h2>
+
+<p>You'll need to configure your application to use any services you enabled:</p>
+
+<table>
+<thead>
+<tr>
+  <th>Service</th>
+  <th>Hostname</th>
+  <th>Port number</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td>php-fpm</td>
+  <td>php-fpm</td>
+  <td>9000</td>
+</tr>
+<tr>
+  <td>MariaDB</td>
+  <td>mariadb</td>
+  <td>3306 (default)</td>
+</tr>
+</tbody>
+</table>
+
+<h1>Docker compose cheatsheet</h1>
+
+<p><strong>Note:</strong> you need to cd first to where your docker-compose.yml file lives.</p>
+
+<ul>
+<li>Start containers in the background: <code>docker-compose up -d</code></li>
+<li>Start containers on the foreground: <code>docker-compose up</code>. You will see a stream of logs for every container running.</li>
+<li>Stop containers: <code>docker-compose stop</code></li>
+<li>Kill containers: <code>docker-compose kill</code></li>
+<li>View container logs: <code>docker-compose logs</code></li>
+<li>Execute command inside of container: <code>docker-compose exec SERVICE_NAME COMMAND</code> where <code>COMMAND</code> is whatever you want to run. Examples:
+    * Shell into the PHP container, <code>docker-compose exec php-fpm bash</code>
+    * Run symfony console, <code>docker-compose exec php-fpm bin/console</code>
+    * Open a mysql shell, <code>docker-compose exec mysql mysql -uroot -pCHOSEN_ROOT_PASSWORD</code></li>
+</ul>
+
+<h1>Recommendations</h1>
+
+<p>It's hard to avoid file permission issues when fiddling about with containers due to the fact that, from your OS point of view, any files created within the container are owned by the process that runs the docker engine (this is usually root). Different OS will also have different problems, for instance you can run stuff in containers using <code>docker exec -it -u $(id -u):$(id -g) CONTAINER_NAME COMMAND</code> to force your current user ID into the process, but this will only work if your host OS is Linux, not mac. Follow a couple of simple rules and save yourself a world of hurt.</p>
+
+<ul>
+<li>Run composer outside of the php container, as doing so would install all your dependencies owned by <code>root</code> within your vendor folder.</li>
+<li>Run commands (ie Symfony's console, or Laravel's artisan) straight inside of your container. You can easily open a shell as described above and do your thing from there.</li>
+</ul>
+    </div>
+    <div class="pure-u-1-24"></div>
+</div>
+
+<script>
+    var tables = document.getElementsByTagName('table');
+    for (var i = 0; i < tables.length; i++) {
+        tables[i].className = "pure-table";
+    }
+</script>
+</body>
+</html>
diff --git a/.docker/sitemap-dev-php7.4/phpdocker/README.md b/.docker/sitemap-dev-php7.4/phpdocker/README.md
@@ -0,0 +1,65 @@
+PHPDocker.io generated environment
+==================================
+
+# Add to your project #
+
+Simply, unzip the file into your project, this will create `docker-compose.yml` on the root of your project and a folder named `phpdocker` containing nginx and php-fpm config for it.
+
+Ensure the webserver config on `phpdocker/nginx/nginx.conf` is correct for your project. PHPDocker.io will have customised this file according to the application type you chose on the generator, for instance `web/app|app_dev.php` on a Symfony project, or `public/index.php` on generic apps.
+
+Note: you may place the files elsewhere in your project. Make sure you modify the locations for the php-fpm dockerfile, the php.ini overrides and nginx config on `docker-compose.yml` if you do so.
+
+# How to run #
+
+Dependencies:
+
+  * Docker engine v1.13 or higher. Your OS provided package might be a little old, if you encounter problems, do upgrade. See [https://docs.docker.com/engine/installation](https://docs.docker.com/engine/installation)
+  * Docker compose v1.12 or higher. See [docs.docker.com/compose/install](https://docs.docker.com/compose/install/)
+
+Once you're done, simply `cd` to your project and run `docker-compose up -d`. This will initialise and start all the containers, then leave them running in the background.
+
+## Services exposed outside your environment ##
+
+You can access your application via **`localhost`**, if you're running the containers directly, or through **``** when run on a vm. nginx and mailhog both respond to any hostname, in case you want to add your own hostname on your `/etc/hosts` 
+
+Service|Address outside containers
+------|---------|-----------
+Webserver|[localhost:5555](http://localhost:5555)
+MariaDB|**host:** `localhost`; **port:** `5558`
+
+## Hosts within your environment ##
+
+You'll need to configure your application to use any services you enabled:
+
+Service|Hostname|Port number
+------|---------|-----------
+php-fpm|php-fpm|9000
+MariaDB|mariadb|3306 (default)
+
+# Docker compose cheatsheet #
+
+**Note:** you need to cd first to where your docker-compose.yml file lives.
+
+  * Start containers in the background: `docker-compose up -d`
+  * Start containers on the foreground: `docker-compose up`. You will see a stream of logs for every container running.
+  * Stop containers: `docker-compose stop`
+  * Kill containers: `docker-compose kill`
+  * View container logs: `docker-compose logs`
+  * Execute command inside of container: `docker-compose exec SERVICE_NAME COMMAND` where `COMMAND` is whatever you want to run. Examples:
+        * Shell into the PHP container, `docker-compose exec php-fpm bash`
+        * Run symfony console, `docker-compose exec php-fpm bin/console`
+        * Open a mysql shell, `docker-compose exec mysql mysql -uroot -pCHOSEN_ROOT_PASSWORD`
+
+# Application file permissions #
+
+As in all server environments, your application needs the correct file permissions to work proberly. You can change the files throught the container, so you won't care if the user exists or has the same id on your host.
+
+`sudo docker exec -it <yourName>-php-fpm chown -R www-data:www-data /application/public`
+
+
+# Recommendations #
+
+It's hard to avoid file permission issues when fiddling about with containers due to the fact that, from your OS point of view, any files created within the container are owned by the process that runs the docker engine (this is usually root). Different OS will also have different problems, for instance you can run stuff in containers using `docker exec -it -u $(id -u):$(id -g) CONTAINER_NAME COMMAND` to force your current user ID into the process, but this will only work if your host OS is Linux, not mac. Follow a couple of simple rules and save yourself a world of hurt.
+
+  * Run composer outside of the php container, as doing so would install all your dependencies owned by `root` within your vendor folder.
+  * Run commands (ie Symfony's console, or Laravel's artisan) straight inside of your container. You can easily open a shell as described above and do your thing from there.
diff --git a/.docker/sitemap-dev-php7.4/phpdocker/nginx/nginx.conf b/.docker/sitemap-dev-php7.4/phpdocker/nginx/nginx.conf
@@ -0,0 +1,26 @@
+server {
+    listen 80 default;
+
+    client_max_body_size 108M;
+
+    access_log /var/log/nginx/application.access.log;
+
+
+    root /application/public;
+    index index.php;
+
+    if (!-e $request_filename) {
+        rewrite ^.*$ /index.php last;
+    }
+
+    location ~ \.php$ {
+        fastcgi_pass php-fpm:9000;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PHP_VALUE "error_log=/var/log/nginx/application_php_errors.log";
+        fastcgi_buffers 16 16k;
+        fastcgi_buffer_size 32k;
+        include fastcgi_params;
+    }
+
+}
diff --git a/.docker/sitemap-dev-php7.4/phpdocker/php-fpm/Dockerfile b/.docker/sitemap-dev-php7.4/phpdocker/php-fpm/Dockerfile
@@ -0,0 +1,10 @@
+FROM phpdockerio/php74-fpm:latest
+WORKDIR "/application"
+
+# Fix debconf warnings upon build
+ARG DEBIAN_FRONTEND=noninteractive
+
+# Install selected extensions and other stuff
+RUN apt-get update \
+    && apt-get -y --no-install-recommends install  php7.4-mysql php7.4-gd \
+    && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
diff --git a/.docker/sitemap-dev-php7.4/phpdocker/php-fpm/php-ini-overrides.ini b/.docker/sitemap-dev-php7.4/phpdocker/php-fpm/php-ini-overrides.ini
@@ -0,0 +1,2 @@
+upload_max_filesize = 100M
+post_max_size = 108M
diff --git a/.docker/updateTest-php7.4/docker-compose.yml b/.docker/updateTest-php7.4/docker-compose.yml
@@ -0,0 +1,40 @@
+###############################################################################
+#                          Generated on phpdocker.io                          #
+###############################################################################
+version: "3.1"
+services:
+
+    mariadb:
+      image: mariadb:5.5
+      container_name: updatetest-mariadb
+      working_dir: /application
+      volumes:
+        - .:/application
+        - ./db:/var/lib/mysql
+      environment:
+        - MYSQL_ROOT_PASSWORD=sitemap
+        - MYSQL_DATABASE=sitemap
+        - MYSQL_USER=sitemap
+        - MYSQL_PASSWORD=sitemap
+      ports:
+        - "5558:3306"
+
+    webserver:
+      image: nginx:alpine
+      container_name: updatetest-webserver
+      working_dir: /application
+      volumes:
+          - .:/application
+          - ./phpdocker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf
+      ports:
+       - "5555:80"
+
+    php-fpm:
+      build: phpdocker/php-fpm
+      container_name: updatetest-php-fpm
+      working_dir: /application
+      volumes:
+        - .:/application
+        - ./../..:/src
+        - ./phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		upload_max_filesize = 100M
		post_max_size = 108M