From 4ee23fba3fc773de3d5cd8a23ed14ca6ac5af7d3 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Thu, 30 Aug 2018 23:08:59 +0200 Subject: [PATCH 1/7] add volume mapping to preserve database changes --- database/.gitignore | 1 + docker-compose.yml | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 database/.gitignore diff --git a/database/.gitignore b/database/.gitignore new file mode 100644 index 0000000..7d04233 --- /dev/null +++ b/database/.gitignore @@ -0,0 +1 @@ +volume/* \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0d16029..38b809c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -54,3 +54,5 @@ services: - MYSQL_PASSWORD ports: - '23306:3306' + volumes: + - ./database/volume/:/var/lib/mysql \ No newline at end of file From 3f1e63cb44219f022aa04bb97341da78212880f0 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Thu, 30 Aug 2018 23:33:31 +0200 Subject: [PATCH 2/7] set permissions to allow upload --- backend.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend.dockerfile b/backend.dockerfile index 285710c..4987db7 100644 --- a/backend.dockerfile +++ b/backend.dockerfile @@ -63,6 +63,6 @@ RUN ln -s ../html api COPY docker/php/.htaccess /var/www/html/ -RUN chown -R www-data:www-data /var/www/html +RUN chown -R www-data:www-data /var/www/html && chmod 750 -R /var/www/html/app/uploads CMD /init-scripts/setup.sh From df816f0dd76953bd2bb3b236d1ca8b80df2c6c85 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Fri, 31 Aug 2018 00:23:18 +0200 Subject: [PATCH 3/7] add missing plugin activation --- docker/php/setup.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/php/setup.sh b/docker/php/setup.sh index d4d3cdf..eb6f82e 100644 --- a/docker/php/setup.sh +++ b/docker/php/setup.sh @@ -13,14 +13,16 @@ wp core update-db --allow-root # Activate plugins in desired order # (if plugin is already activated command will do nothing) +wp plugin activate woocommerce --allow-root +wp plugin activate woocommerce-product-bundles --allow-root wp plugin activate woocommerce-jetpack --allow-root -wp plugin activate groups --allow-root wp plugin activate jwt-authentication-for-wp-rest-api --allow-root -wp plugin activate wiaas --allow-root wp plugin activate gravityforms --allow-root wp plugin activate gravityflow --allow-root wp plugin activate capability-manager-enhanced --allow-root +wp plugin activate groups --allow-root wp plugin activate wp-user-groups --allow-root +wp plugin activate wiaas --allow-root # Execute database update for updated plugins # (if no changes detected command will do nothing) From bc15706f07be4da3d8f50327c3ff12aa9d62ad48 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Fri, 31 Aug 2018 17:35:36 +0200 Subject: [PATCH 4/7] allow customer to add comments --- .../wiaas/includes/db-updates/wiaas-db-update-functions.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php b/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php index 3ce2174..341ffe2 100644 --- a/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php +++ b/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php @@ -82,7 +82,8 @@ function wiaas_db_update_setup_customer_capabilities() { $customer_role = get_role('customer'); $customer_role->add_cap('read_private_shop_orders'); - $customer_role->add_cap('read_shop_order'); + $customer_role->add_cap('read_shop_order'); + $customer_role->add_cap('publish_shop_order'); } function wiaas_db_update_add_customer_read_permission() { From 513401c9db5d03dabbd0f39452a8c6041d3f1131 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Fri, 31 Aug 2018 18:35:48 +0200 Subject: [PATCH 5/7] refactor code --- .../app/plugins/wiaas/includes/class-wiaas-db-update.php | 1 - .../includes/db-updates/wiaas-db-update-functions.php | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/backend/app/plugins/wiaas/includes/class-wiaas-db-update.php b/backend/app/plugins/wiaas/includes/class-wiaas-db-update.php index 9121bb4..97e8023 100644 --- a/backend/app/plugins/wiaas/includes/class-wiaas-db-update.php +++ b/backend/app/plugins/wiaas/includes/class-wiaas-db-update.php @@ -9,7 +9,6 @@ class Wiaas_DB_Update { '20180801222206' => 'wiaas_db_update_setup_gravity', '20180802222206' => 'wiaas_db_update_add_delivery_process_forms', '20180807222206' => 'wiaas_db_update_setup_customer_capabilities', - '20180809134511' => 'wiaas_db_update_add_customer_read_permission', '20180811134511' => 'wiaas_db_update_enable_orders_access_management', '20180813134511' => 'wiaas_db_update_enable_order_numbers', '20180826153509' => 'wiaas_create_broker_access_group' diff --git a/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php b/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php index 341ffe2..03b70b1 100644 --- a/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php +++ b/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php @@ -82,13 +82,10 @@ function wiaas_db_update_setup_customer_capabilities() { $customer_role = get_role('customer'); $customer_role->add_cap('read_private_shop_orders'); + $customer_role->add_cap('read_private_products'); $customer_role->add_cap('read_shop_order'); $customer_role->add_cap('publish_shop_order'); -} - -function wiaas_db_update_add_customer_read_permission() { - $role = get_role( 'customer' ); - $role->add_cap( 'read_private_products' ); + } function wiaas_db_update_enable_orders_access_management() { From d90c12406b30c0eb19dc247bb37f7ceb737200c8 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Fri, 31 Aug 2018 20:39:04 +0200 Subject: [PATCH 6/7] fix typo --- .../wiaas/includes/db-updates/wiaas-db-update-functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php b/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php index 03b70b1..86c9f30 100644 --- a/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php +++ b/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php @@ -84,7 +84,7 @@ function wiaas_db_update_setup_customer_capabilities() { $customer_role->add_cap('read_private_shop_orders'); $customer_role->add_cap('read_private_products'); $customer_role->add_cap('read_shop_order'); - $customer_role->add_cap('publish_shop_order'); + $customer_role->add_cap('publish_shop_orders'); } From 06fc46fbc5e8f9d7c029aefe7003ed42ea8996f2 Mon Sep 17 00:00:00 2001 From: Almira Krdzic Date: Mon, 3 Sep 2018 23:22:10 +0200 Subject: [PATCH 7/7] Run database migration as www-data user --- backend.dockerfile | 4 ++-- docker/php/setup.sh | 42 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/backend.dockerfile b/backend.dockerfile index 4987db7..b638aa8 100644 --- a/backend.dockerfile +++ b/backend.dockerfile @@ -35,7 +35,7 @@ ENV WP_LOGGED_IN_SALT ${WP_LOGGED_IN_SALT} ENV WP_NONCE_SALT ${WP_NONCE_SALT} ENV WP_JWT_AUTH_SECRET_KEY ${WP_JWT_AUTH_SECRET_KEY} -RUN apt-get update && apt-get install -y git unzip gnupg mysql-client +RUN apt-get update && apt-get install -y git unzip gnupg mysql-client sudo COPY docker/php/composer.phar /usr/local/bin/composer RUN chmod 755 /usr/local/bin/composer @@ -63,6 +63,6 @@ RUN ln -s ../html api COPY docker/php/.htaccess /var/www/html/ -RUN chown -R www-data:www-data /var/www/html && chmod 750 -R /var/www/html/app/uploads +RUN chown -R www-data:www-data /var/www/html CMD /init-scripts/setup.sh diff --git a/docker/php/setup.sh b/docker/php/setup.sh index eb6f82e..cd47b5b 100644 --- a/docker/php/setup.sh +++ b/docker/php/setup.sh @@ -8,29 +8,29 @@ while ! mysqladmin ping -h"db" --silent; do done echo "Ready...." -# Apply core database updates if needed -wp core update-db --allow-root +sudo -u www-data -s -- <