Merge branch 'release-1.12.2'

.editorconfig

+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+
+# Change these settings to your own preference
+indent_style = space
+indent_size = 4
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.env

-PROJECT=biuro-staging
-
-IMAGE_NGINX=fholzer/nginx-brotli
-IMAGE_MYSQL=mariadb:10.3
-IMAGE_WORDPRESS=biuro/web:1.12.1
-IMAGE_WORDPRESS_CLI=wordpress:cli-php7.3
-
-DB_NAME=staging_biuro
-DB_HOST=mysql
-DB_USERNAME=staging_user
-DB_PASSWORD=qzl8pMNV^gZ&c1!7ebVsXqQh
-DB_ROOT_PASSWORD=#w1ML4QfWaR*8dBYRL7aZJI$
-
-UID=33
-GID=33
-
-NGINX_NAME_LT=staging.biuro.lt
-NGINX_NAME_LV=staging.biuro.lv
-NGINX_NAME_EE=staging.biuro.ee
+PROJECT=biuro-staging
+
+IMAGE_NGINX=fholzer/nginx-brotli
+IMAGE_MYSQL=mariadb:10.3
+IMAGE_WORDPRESS=biuro/web:1.12.2
+IMAGE_WORDPRESS_CLI=wordpress:cli-php7.3
+
+DB_NAME=staging_biuro
+DB_HOST=mysql
+DB_USERNAME=staging_user
+DB_PASSWORD=qzl8pMNV^gZ&c1!7ebVsXqQh
+DB_ROOT_PASSWORD=#w1ML4QfWaR*8dBYRL7aZJI$
+
+UID=33
+GID=33
+
+NGINX_NAME_LT=staging.biuro.lt
+NGINX_NAME_LV=staging.biuro.lv
+NGINX_NAME_EE=staging.biuro.ee

.gitattributes

+* text=auto eol=lf

docker-compose.yml

-version: '3.6'
-
-services:
-    mysql:
-        image: ${IMAGE_MYSQL}
-        container_name: "${PROJECT}-mysql"
-        networks:
-            - "back"
-        volumes:
-            - ./docker/mariadb:/docker-entrypoint-initdb.d/
-            - ./var/mariadb:/var/lib/mysql
-        environment:
-            - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
-            - MYSQL_DATABASE=${DB_NAME}
-            - MYSQL_USER=${DB_USERNAME}
-            - MYSQL_PASSWORD=${DB_PASSWORD}
-        command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --innodb-flush-method=fsync
-        restart: always
-
-    wordpress:
-        image: ${IMAGE_WORDPRESS}
-        container_name: "${PROJECT}-wordpress"
-        networks:
-            - "front"
-            - "back"
-        volumes:
-            - ./nginx/.htpasswd:/etc/nginx/.htpasswd
-            - ./nginx/php.ini:/usr/local/etc/php/conf.d/php.ini
-            - ./wordpress:/var/www/html
-        environment:
-            - WORDPRESS_DB_NAME=${DB_NAME}
-            - WORDPRESS_DB_HOST=${DB_HOST}
-            - WORDPRESS_DB_USER=${DB_USERNAME}
-            - WORDPRESS_DB_PASSWORD=${DB_PASSWORD}
-            - WORDPRESS_CONFIG_EXTRA=
-                /* Multisite */
-                define( 'WP_ALLOW_MULTISITE', true );
-                define('MULTISITE', true);
-                define('SUBDOMAIN_INSTALL', true);
-                define('DOMAIN_CURRENT_SITE', '${NGINX_NAME_LT}');
-                define('PATH_CURRENT_SITE', '/');
-                define('SITE_ID_CURRENT_SITE', 1);
-                define('BLOG_ID_CURRENT_SITE', 1);
-                define( 'COOKIE_DOMAIN', '' );
-                define( 'ADMIN_COOKIE_PATH', '/' );
-                define( 'COOKIEPATH', '/' );
-                define( 'SITECOOKIEPATH', '/' );
-                define( 'NOBLOGREDIRECT', '' );
-                define( 'WP_HOME', 'https://${NGINX_NAME_LT}' );
-                define( 'WP_SITEURL', 'https://${NGINX_NAME_LT}' );
-                define( 'DISALLOW_FILE_EDIT', false );
-
-        links:
-            - mysql
-        restart: always
-
-    nginx:
-        image: ${IMAGE_NGINX}
-        container_name: "${PROJECT}-nginx"
-        networks:
-            - front
-        ports:
-            - '80:80'
-            - '443:443'
-        volumes:
-            - ./nginx/.htpasswd:/etc/nginx/.htpasswd
-            - ./nginx/conf.d:/etc/nginx/conf.d
-            - ./nginx/h5bp:/etc/nginx/h5bp
-            - ./nginx/nginx.conf:/etc/nginx/nginx.conf
-            - ./nginx/redirects:/etc/nginx/redirects
-            - ./nginx/cache:/var/cache/nginx
-
-            - ./logs/nginx:/var/log/nginx
-            - ./certs:/etc/letsencrypt
-            - ./certs-data:/data/letsencrypt
-
-            - ./wordpress:/var/www/html
-        links:
-            - wordpress
-        restart: always
-
-    wordpress-cli:
-        image: ${IMAGE_WORDPRESS_CLI}
-        user: "${UID}:${GID}"
-        container_name: "${PROJECT}-wordpress-cli"
-        links:
-            - wordpress
-            - mysql
-        networks:
-            - "back"
-        volumes:
-            - './var/wp-cli/cache:/etc/X11/fs/.wp-cli/cache'
-
-            - ./wordpress:/var/www/html
-
-            - './wp-init.sh:/usr/local/bin/wp-init.sh'
-        command: >
-            /bin/sh -c '
-                sleep 15;
-                echo "WP CLI init";
-
-                wp core update --force;
-                wp core update-db --network;
-
-                wp language core update;
-                wp language theme update --all;
-                wp language plugin update --all;
-
-                echo "WP CLI done. Ready to use.";
-            '
-
-networks:
-    front:
-        name: "${PROJECT}-front"
-    back:
-        name: "${PROJECT}-back"
-
-volumes:
-        wordpress: { }
-        wp-content: { }
+version: '3.6'
+
+services:
+    mysql:
+        image: ${IMAGE_MYSQL}
+        container_name: "${PROJECT}-mysql"
+        networks:
+            - "back"
+        volumes:
+            - ./docker/mariadb:/docker-entrypoint-initdb.d/
+            - ./var/mariadb:/var/lib/mysql
+        environment:
+            - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
+            - MYSQL_DATABASE=${DB_NAME}
+            - MYSQL_USER=${DB_USERNAME}
+            - MYSQL_PASSWORD=${DB_PASSWORD}
+        command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --innodb-flush-method=fsync
+        restart: always
+
+    wordpress:
+        image: ${IMAGE_WORDPRESS}
+        container_name: "${PROJECT}-wordpress"
+        networks:
+            - "front"
+            - "back"
+        volumes:
+            - ./nginx/.htpasswd:/etc/nginx/.htpasswd
+            - ./nginx/php.ini:/usr/local/etc/php/conf.d/php.ini
+            - ./wordpress:/var/www/html
+        environment:
+            - WORDPRESS_DB_NAME=${DB_NAME}
+            - WORDPRESS_DB_HOST=${DB_HOST}
+            - WORDPRESS_DB_USER=${DB_USERNAME}
+            - WORDPRESS_DB_PASSWORD=${DB_PASSWORD}
+            - WORDPRESS_CONFIG_EXTRA=
+                /* Multisite */
+                define( 'WP_ALLOW_MULTISITE', true );
+                define('MULTISITE', true);
+                define('SUBDOMAIN_INSTALL', true);
+                define('DOMAIN_CURRENT_SITE', '${NGINX_NAME_LT}');
+                define('PATH_CURRENT_SITE', '/');
+                define('SITE_ID_CURRENT_SITE', 1);
+                define('BLOG_ID_CURRENT_SITE', 1);
+                define( 'COOKIE_DOMAIN', '' );
+                define( 'ADMIN_COOKIE_PATH', '/' );
+                define( 'COOKIEPATH', '/' );
+                define( 'SITECOOKIEPATH', '/' );
+                define( 'NOBLOGREDIRECT', '' );
+                define( 'WP_HOME', 'https://${NGINX_NAME_LT}' );
+                define( 'WP_SITEURL', 'https://${NGINX_NAME_LT}' );
+                define( 'DISALLOW_FILE_EDIT', false );
+
+        links:
+            - mysql
+        restart: always
+
+    nginx:
+        image: ${IMAGE_NGINX}
+        container_name: "${PROJECT}-nginx"
+        networks:
+            - front
+        ports:
+            - '80:80'
+            - '443:443'
+        volumes:
+            - ./nginx/.htpasswd:/etc/nginx/.htpasswd
+            - ./nginx/conf.d:/etc/nginx/conf.d
+            - ./nginx/h5bp:/etc/nginx/h5bp
+            - ./nginx/nginx.conf:/etc/nginx/nginx.conf
+            - ./nginx/redirects:/etc/nginx/redirects
+            - ./nginx/cache:/var/cache/nginx
+
+            - ./logs/nginx:/var/log/nginx
+            - ./certs:/etc/letsencrypt
+            - ./certs-data:/data/letsencrypt
+
+            - ./wordpress:/var/www/html
+        links:
+            - wordpress
+        restart: always
+
+    wordpress-cli:
+        image: ${IMAGE_WORDPRESS_CLI}
+        user: "${UID}:${GID}"
+        container_name: "${PROJECT}-wordpress-cli"
+        links:
+            - wordpress
+            - mysql
+        networks:
+            - "back"
+        volumes:
+            - './var/wp-cli/cache:/etc/X11/fs/.wp-cli/cache'
+
+            - ./wordpress:/var/www/html
+
+            - './wp-init.sh:/usr/local/bin/wp-init.sh'
+        command: >
+            /bin/sh -c '
+                sleep 15;
+                echo "WP CLI init";
+
+                wp core update --force;
+                wp core update-db --network;
+
+                wp language core update;
+                wp language theme update --all;
+                wp language plugin update --all;
+
+                echo "WP CLI done. Ready to use.";
+            '
+
+networks:
+    front:
+        name: "${PROJECT}-front"
+    back:
+        name: "${PROJECT}-back"
+
+volumes:
+        wordpress: { }
+        wp-content: { }