README update

.env

 PROJECT=dev-biuro
 
-#IMAGE_NGINX=nginx:1.15.7
 IMAGE_NGINX=kbenassm/nginx-brotli-tls13
 IMAGE_MYSQL=mariadb:10.3
 IMAGE_WORDPRESS=wordpress:php7.3-fpm

README.md

@@ -10,32 +10,38 @@
 - Install [Docker Desktop](https://www.docker.com/products/docker-desktop) on your machine
 	- Creating new User on my machine helped me with sharing C drive problem (https://tomssl.com/2018/01/11/sharing-your-c-drive-with-docker-for-windows-when-using-azure-active-directory-azuread-aad/)
 - Clone [dev.biuro](http://git.biuro.lt/biuro/dev.biuro) repository
-- in Command Prompt run `docker-compose up -d`
-- `docker ps` command should output existing docker containers (nginx, mysql, wordpress)
+- in Command Prompt run `docker-compose up` and wait until WP cli exits (dev-biuro-wordpress-cli exited with code 0)
 - set dev.biuro.lt, dev.biuro.lv, dev.biuro.ee to 127.0.0.1 in hosts
 - check if dev.biuro.lt, dev.biuro.lv, dev.biuro.ee works
+- for CSS & JS assets we user npm, install `C:\web\dev.biuro\ npm install`
 
 ## Development
-- `C:\web\dev.biuro\ npm install`
 - `C:\web\dev.biuro\ npm run dev`
-- `C:\web\dev.biuro\ npm run build`
 
-### staging
-server: 18.197.154.248
-user: ubuntu
+## Production
+- build CSS & JS assets - `C:\web\dev.biuro\ npm run build`
+- build new image `docker build -t biuro/web:0.0.27 .` (update version number)
+- login to biuro docker account  `docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs`
+- push image to docker repository - `docker push biuro/web:0.0.27`
 
-### live
-server: 18.195.10.89
-user: admin
+## Production
+- update biuro/web image version in .env file (staging or www)
+- upload to server .env file
+- login to server via ssh and navigatate to root folder (biuro-staging or wwww)
+- login to biuro docker account - `sudo docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs`
+- use new image version  - `sudo docker-compose up -d`
 
+### staging
+- server: 18.197.154.248
+- user: ubuntu
 
-### DB backup
-- `C:\web\dev.biuro> docker exec -i dev-biuro-mysql mysqldump -udev_user -pY6V6bFkD6@GyD!wTShgFmWz! --default-character-set=utf8 dev_biuro > docker/mariadb/data-004.sql`
-- `sudo docker exec -i biuro-staging-mysql mysqldump -ustaging_user -p'qzl8pMNV^gZ&c1!7ebVsXqQh' --default-character-set=utf8 staging_biuro > docker/mariadb/data-014.sql`
-- `sudo docker exec -i biuro-www-mysql mysqldump -uwww_user -p'qzl8pMNV^gZ&c1!7ebVsXqQh' --default-character-set=utf8 www_biuro > docker/mariadb/data-014.sql`
+### live
+- server: 18.195.10.89
+- user: admin
 
-### DB restore
-- `C:\web\dev.biuro> docker exec -i dev-biuro-mysql mysql -udev_user -pY6V6bFkD6@GyD!wTShgFmWz! --default-character-set=utf8 dev_biuro < docker/mariadb/data-004.sql`
+### Basic Auth
+- biuro_wp_api
+- LabAiGeRsKodsu89wapI
 
 ## Wordpress
 - Regions created using [Wordpress Network](https://codex.wordpress.org/Create_A_Network)
@@ -45,6 +51,14 @@ user: admin
 - laikinas2587
 - info@biuro.eu
 
+### DB backup
+- `C:\web\dev.biuro> docker exec -i dev-biuro-mysql mysqldump -udev_user -pY6V6bFkD6@GyD!wTShgFmWz! --default-character-set=utf8 dev_biuro > docker/mariadb/data-004.sql`
+- `sudo docker exec -i biuro-staging-mysql mysqldump -ustaging_user -p'qzl8pMNV^gZ&c1!7ebVsXqQh' --default-character-set=utf8 staging_biuro > docker/mariadb/data-014.sql`
+- `sudo docker exec -i biuro-www-mysql mysqldump -uwww_user -p'qzl8pMNV^gZ&c1!7ebVsXqQh' --default-character-set=utf8 www_biuro > docker/mariadb/data-014.sql`
+
+### DB restore
+- `C:\web\dev.biuro> docker exec -i dev-biuro-mysql mysql -udev_user -pY6V6bFkD6@GyD!wTShgFmWz! --default-character-set=utf8 dev_biuro < docker/mariadb/data-004.sql`
+
 ### Plugins
 #### Akismet Anti-Spam
 #### Cookies warning
@@ -55,10 +69,6 @@ user: admin
 #### Polylang
 #### Yoast SEO
 
-### Basic Auth
-- biuro_wp_api
-- LabAiGeRsKodsu89wapI
-
 ### SEO
 - [Biuro SEO auditas](https://docs.google.com/document/d/1FiwVoiLvGGmi9V-HPBgJ3gsh3wGswt27csgvfdTU24w/edit?usp=sharing)
 - [Biuro raktinių žodžių analizė](https://docs.google.com/spreadsheets/d/1ggnqKuGxFFkLgI6NDZq4PXpRY_whdHX0kjZj7pCP_fk/edit?ts=5b5eaa62#gid=0)
@@ -75,7 +85,7 @@ in Admin sidebar: SEO -> Social -> Accounts tab
 
 
 
-## Known issues (Windows 10)
+## Known local issues (Windows 10)
 ### Error
 ERROR: for mysql  Cannot start service mysql: error while creating mount source path '/host_mnt/c/web/dev.biuro/var/mariadb': mkdir /host_mnt/c: file exists
 
@@ -114,8 +124,6 @@ Can't share C drive
 - docker restart dev-biuro-nginx
 - docker restart dev-biuro-wordpress
 
-- sudo docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs
-
 - sudo docker-compose up -d
 
 - sudo docker restart staging-biuro-nginx
@@ -129,11 +137,6 @@ Can't share C drive
 
 - docker load --input ourdemo.tar
 
-- docker build -t biuro/web:0.0.27 .
-- docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs
-- sudo docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs
-- docker push biuro/web:0.0.27
-
 - sudo chown -R www-data:www-data wordpress/wp-content/plugins
 
 
@@ -145,14 +148,10 @@ Can't share C drive
 - `use dev_biuro;`
 - `show tables;`
 
-
-
 - `sudo docker exec -it biuro-staging-mysql bash`
 - `sudo docker exec -it biuro-www-mysql bash`
 - `mysql -uroot -p'#w1ML4QfWaR*8dBYRL7aZJI$' --default-character-set=utf8`
 
-
-
 - `use information_schema;`
 - `select * from SCHEMATA;`
 

docker-compose.yml

@@ -63,6 +63,11 @@ services:
                 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
@@ -146,16 +151,14 @@ services:
                 echo "WP CLI init";
                 wp core update --force;
                 wp core update-db --network;
-                wp option update permalink_structure "/%postname%/" --skip-themes --skip-plugins;
+                # wp option update permalink_structure "/%postname%/" --skip-themes --skip-plugins;
                 # wp option update timezone_string "Manual Offsets/UTC+2";
                 # wp option update date_format "Y-m-d";
-                wp option update time_format "H:i";
-                # wp plugin install permalink-manager --force --activate-network;
+                # wp option update time_format "H:i";
                 wp plugin install pods --activate-network;
                 wp plugin install polylang --activate-network;
                 wp plugin install wordpress-seo --activate-network;
                 wp plugin install loco-translate --activate-network;
-                wp plugin install google-sitemap-generator --activate-network;
                 wp plugin update --all;
                 wp plugin activate akismet --network;
                 wp plugin activate biuro-contacts --network;
@@ -166,6 +169,7 @@ services:
                 wp plugin activate biuro-values --network;
                 wp plugin activate cookies-warning --network;
                 wp plugin activate data-controller --network;
+                wp plugin activate jobs-importer --network;
                 wp theme update --all;
                 wp theme activate biuro;
                 wp language core update;