From 4aee308f28073ddf6f3c844799d5f493b18bbc7a Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 23 Jan 2019 10:38:43 +0700 Subject: [PATCH 01/49] Add Noodle Pos Pro repo --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 67395cd..42a3555 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { choice(name: 'HTTP_SERVER', choices: ['nginx-1.8', 'apache-2.2', 'apache-2.4'], description: 'HTTP Server') choice(name: 'PHP_VERSION', choices: ['7.2', '7.1', '7.0', '5.6'], description: 'PHP Version') choice(name: 'MAGENTO_VERSION', choices: ['2.3.0', '2.2.7', '2.2.6', '2.1.16'], description: 'Magento Version') - choice(name: 'GITHUB_REPO', choices: ['magestore-shark/pos-pro', 'Magestore/pos-standard', 'Magestore/pos-pro', 'Magestore/pos-enterprise'], description: 'Github repository') + choice(name: 'GITHUB_REPO', choices: ['magestore-Noodle/pos-pro', 'magestore-shark/pos-pro', 'Magestore/pos-standard', 'Magestore/pos-pro', 'Magestore/pos-enterprise'], description: 'Github repository') string(name: 'GITHUB_BRANCH', defaultValue: '4-develop', description: 'Github branch or pull request. Example: 3-develop, pull/3') choice(name: 'TIME_TO_LIVE', choices: ['1h', '2h', '4h', '1d', '7d'], description: 'Server living time') credentials(name: 'GITHUB_USER', description: 'Github username and password', defaultValue: 'c005e544-9ad8-48be-ba44-a0f6d519a2ec', credentialType: "Username with password", required: true) From e68de09eb1e572bc2cb5bb1bbd74d40f0445e9dc Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 23 Jan 2019 10:41:21 +0700 Subject: [PATCH 02/49] Add default credential user --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 42a3555..5f44f6f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { choice(name: 'GITHUB_REPO', choices: ['magestore-Noodle/pos-pro', 'magestore-shark/pos-pro', 'Magestore/pos-standard', 'Magestore/pos-pro', 'Magestore/pos-enterprise'], description: 'Github repository') string(name: 'GITHUB_BRANCH', defaultValue: '4-develop', description: 'Github branch or pull request. Example: 3-develop, pull/3') choice(name: 'TIME_TO_LIVE', choices: ['1h', '2h', '4h', '1d', '7d'], description: 'Server living time') - credentials(name: 'GITHUB_USER', description: 'Github username and password', defaultValue: 'c005e544-9ad8-48be-ba44-a0f6d519a2ec', credentialType: "Username with password", required: true) + credentials(name: 'GITHUB_USER', description: 'Github username and password', defaultValue: 'd79f2198-246f-431c-94c5-3d2824ca8e31', credentialType: "Username with password", required: true) } environment { CI = 'true' From bd0ac2f8c56b94cea339a28afe7ffa49e01b2faf Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 23 Jan 2019 10:43:31 +0700 Subject: [PATCH 03/49] Change order param --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5f44f6f..3c1c810 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { } } parameters { - choice(name: 'HTTP_SERVER', choices: ['nginx-1.8', 'apache-2.2', 'apache-2.4'], description: 'HTTP Server') + choice(name: 'HTTP_SERVER', choices: ['apache-2.4', 'apache-2.2', 'nginx-1.8'], description: 'HTTP Server') choice(name: 'PHP_VERSION', choices: ['7.2', '7.1', '7.0', '5.6'], description: 'PHP Version') choice(name: 'MAGENTO_VERSION', choices: ['2.3.0', '2.2.7', '2.2.6', '2.1.16'], description: 'Magento Version') choice(name: 'GITHUB_REPO', choices: ['magestore-Noodle/pos-pro', 'magestore-shark/pos-pro', 'Magestore/pos-standard', 'Magestore/pos-pro', 'Magestore/pos-enterprise'], description: 'Github repository') From 2a136d723542558a94494ce349195b74034c4609 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 23 Jan 2019 10:48:29 +0700 Subject: [PATCH 04/49] Add more testing environments --- .../apache-2.4/docker-compose.php-7.2.yml | 40 +++++++++++++++++++ .../nginx-1.8/docker-compose.php-7.1.yml | 40 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml create mode 100644 magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml diff --git a/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml b/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml new file mode 100644 index 0000000..09c8cc4 --- /dev/null +++ b/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml @@ -0,0 +1,40 @@ +version: '3' +services: + magento: + image: magestore/mftf:2.3.0-apache-php7.2.13 + volumes: + - ./server/app/code/Magestore:/var/www/html/app/code/Magestore + ports: + - 8080-8089:80 + networks: + webnet: + aliases: + - localhost.com + + db: + image: magestore/mftf-db:percona-5.7 + environment: + MYSQL_ROOT_PASSWORD: magento + networks: + - webnet + + phpmyadmin: + image: phpmyadmin/phpmyadmin + ports: + - 8060-8069:80 + environment: + PMA_HOST: db + PMA_USER: root + PMA_PASSWORD: magento + networks: + - webnet + + mailhog: + image: mailhog/mailhog + ports: + - 8020-8029:8025 + networks: + - webnet + +networks: + webnet: diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml new file mode 100644 index 0000000..11e1c18 --- /dev/null +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml @@ -0,0 +1,40 @@ +version: '3' +services: + magento: + image: magestore/mftf:2.3.0-nginx-php7.1.25 + volumes: + - ./server/app/code/Magestore:/var/www/html/app/code/Magestore + ports: + - 8080-8089:80 + networks: + webnet: + aliases: + - localhost.com + + db: + image: magestore/mftf-db:percona-5.7 + environment: + MYSQL_ROOT_PASSWORD: magento + networks: + - webnet + + phpmyadmin: + image: phpmyadmin/phpmyadmin + ports: + - 8060-8069:80 + environment: + PMA_HOST: db + PMA_USER: root + PMA_PASSWORD: magento + networks: + - webnet + + mailhog: + image: mailhog/mailhog + ports: + - 8020-8029:8025 + networks: + - webnet + +networks: + webnet: From 120d1641b681229fe2d972e43bffb3a6131e13b5 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 23 Jan 2019 10:53:58 +0700 Subject: [PATCH 05/49] Fix repo name --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3c1c810..4ff84c5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { choice(name: 'HTTP_SERVER', choices: ['apache-2.4', 'apache-2.2', 'nginx-1.8'], description: 'HTTP Server') choice(name: 'PHP_VERSION', choices: ['7.2', '7.1', '7.0', '5.6'], description: 'PHP Version') choice(name: 'MAGENTO_VERSION', choices: ['2.3.0', '2.2.7', '2.2.6', '2.1.16'], description: 'Magento Version') - choice(name: 'GITHUB_REPO', choices: ['magestore-Noodle/pos-pro', 'magestore-shark/pos-pro', 'Magestore/pos-standard', 'Magestore/pos-pro', 'Magestore/pos-enterprise'], description: 'Github repository') + choice(name: 'GITHUB_REPO', choices: ['Magestore-Noodle/pos-pro', 'magestore-shark/pos-pro', 'Magestore/pos-standard', 'Magestore/pos-pro', 'Magestore/pos-enterprise'], description: 'Github repository') string(name: 'GITHUB_BRANCH', defaultValue: '4-develop', description: 'Github branch or pull request. Example: 3-develop, pull/3') choice(name: 'TIME_TO_LIVE', choices: ['1h', '2h', '4h', '1d', '7d'], description: 'Server living time') credentials(name: 'GITHUB_USER', description: 'Github username and password', defaultValue: 'd79f2198-246f-431c-94c5-3d2824ca8e31', credentialType: "Username with password", required: true) From 38b840b178ee5b6f3c7e258c1be26526d5f7071c Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 23 Jan 2019 11:03:33 +0700 Subject: [PATCH 06/49] Add node name to the script --- bin/build.sh | 1 + bin/finish.sh | 2 +- bin/run.sh | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index 10ad0a7..f269a19 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -1,4 +1,5 @@ #!/usr/bin/env sh +echo "This step running on node $NODE_NAME" if [[ ! -z "${JENKINS_DATA}" ]]; then cd $JENKINS_DATA/workspace/$JOB_BASE_NAME diff --git a/bin/finish.sh b/bin/finish.sh index 2542a47..e57f6b3 100755 --- a/bin/finish.sh +++ b/bin/finish.sh @@ -1,5 +1,5 @@ #!/usr/bin/env sh - +echo "This step running on node $NODE_NAME" set +x if [[ ! -z "${JENKINS_DATA}" ]]; then diff --git a/bin/run.sh b/bin/run.sh index aa4bdcc..50e9351 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -1,4 +1,5 @@ #!/usr/bin/env sh +echo "This step running on node $NODE_NAME" if [[ ! -z "${JENKINS_DATA}" ]]; then cd $JENKINS_DATA/workspace/$JOB_BASE_NAME From d9ddc28560243f4006ca5845e73e47c179a921af Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 23 Jan 2019 11:31:57 +0700 Subject: [PATCH 07/49] Change and fix build server magento --- bin/build.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index f269a19..173be35 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -52,6 +52,23 @@ cp -Rf client/pos/build server/app/code/Magestore/Webpos/build/apps/pos cp ../$COMPOSE_FILE docker-compose.yml COMPOSE_HTTP_TIMEOUT=200 docker-compose up -d +# check db container is run correctly +WHILE_LIMIT=10 # timeout 360 seconds +while ! DBISUP=`docker-compose ps | grep 3306 | grep Up` +do + if [ ! -z "$DBISUP" ]; then + break + else + docker-compose rm db # remove stopped container + COMPOSE_HTTP_TIMEOUT=200 docker-compose up -d + if [ $WHILE_LIMIT -lt 1 ]; then + break + fi + fi + WHILE_LIMIT=$(( WHILE_LIMIT - 1 )) + sleep 3 +done + PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` MAGENTO_URL="http://$NODE_IP:$PORT" @@ -66,13 +83,41 @@ do sleep 5 done +# if [[ ${RESPONSE:0:8} != "Magento/" ]]; then +# docker-compose restart magento +# PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` +# MAGENTO_URL="http://$NODE_IP:$PORT" +# while ! RESPONSE=`docker-compose exec -T magento curl -s https://localhost.com/magento_version` +# do +# sleep 5 +# done +# fi + +# recheck and wait for db is up if [[ ${RESPONSE:0:8} != "Magento/" ]]; then - docker-compose restart magento + COMPOSE_HTTP_TIMEOUT=200 docker-compose restart magento PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` MAGENTO_URL="http://$NODE_IP:$PORT" - while ! RESPONSE=`docker-compose exec -T magento curl -s https://localhost.com/magento_version` + RETRY_LIMIT=1 # retry 1 loop + COUNT_OUT_LIMIT=100 # timeout 300 seconds + while ! docker-compose exec -T magento curl -s https://localhost.com/magento_version do - sleep 5 + COUNT_OUT_LIMIT=$(( COUNT_OUT_LIMIT - 1 )) + if [ $COUNT_OUT_LIMIT -lt 1 ]; then + # if database cannot start or error try to restart it + if [ -z "$(docker-compose ps | grep 3306 | grep Up)" ]; then + docker-compose rm db # remove stopped container + COMPOSE_HTTP_TIMEOUT=200 docker-compose up -d + COUNT_OUT_LIMIT=100 + RETRY_LIMIT=$(( RETRY_LIMIT - 1 )) + fi + if [ $RETRY_LIMIT -lt 1 ]; then + echo "Error with db logs:" + docker-compose logs db + exit 1 + fi + fi + sleep 3 done fi From 7c600e3b765b004854e90c5b6e2cc95d803d0db3 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 23 Jan 2019 11:58:22 +0700 Subject: [PATCH 08/49] Build magento server increment wait timeout --- bin/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index 173be35..5fb5aa6 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -73,7 +73,7 @@ PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` MAGENTO_URL="http://$NODE_IP:$PORT" # Check magento installation -COUNT_LIMIT=120 # timeout 600 seconds +COUNT_LIMIT=240 # timeout 600 seconds while ! RESPONSE=`docker-compose exec -T magento curl -s https://localhost.com/magento_version` do if [ $COUNT_LIMIT -lt 1 ]; then From 4fde412b6dbb339afce11b06cd8d7ed60d2fb5ea Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 23 Jan 2019 12:27:31 +0700 Subject: [PATCH 09/49] Fix build step add wait for complately magento installation --- bin/build.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bin/build.sh b/bin/build.sh index 5fb5aa6..43d18ed 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -72,6 +72,17 @@ done PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` MAGENTO_URL="http://$NODE_IP:$PORT" +# Wait for complately magento installation +COUNT_LIMIT=1000 # timeout 3000 seconds +while [ ! -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] +do + if [ $COUNT_LIMIT -lt 1 ]; then + break + fi + COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) + sleep 3 +done + # Check magento installation COUNT_LIMIT=240 # timeout 600 seconds while ! RESPONSE=`docker-compose exec -T magento curl -s https://localhost.com/magento_version` From 1f2e55fe81326bd4453a257ebed240534a139cde Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 23 Jan 2019 14:06:56 +0700 Subject: [PATCH 10/49] Change try to wait magento server install complately after check first magento_version --- bin/build.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 43d18ed..47f331d 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -72,26 +72,26 @@ done PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` MAGENTO_URL="http://$NODE_IP:$PORT" -# Wait for complately magento installation -COUNT_LIMIT=1000 # timeout 3000 seconds -while [ ! -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] +# Check magento installation +COUNT_LIMIT=240 # timeout 600 seconds +while ! RESPONSE=`docker-compose exec -T magento curl -s https://localhost.com/magento_version` do if [ $COUNT_LIMIT -lt 1 ]; then break fi COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) - sleep 3 + sleep 5 done -# Check magento installation -COUNT_LIMIT=240 # timeout 600 seconds -while ! RESPONSE=`docker-compose exec -T magento curl -s https://localhost.com/magento_version` +# Wait for complately magento installation +COUNT_LIMIT=1000 # timeout 3000 seconds +while [ ! -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] do if [ $COUNT_LIMIT -lt 1 ]; then break fi COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) - sleep 5 + sleep 3 done # if [[ ${RESPONSE:0:8} != "Magento/" ]]; then From 0487c0c327e0fdd35d94a6490fd5f81a0ba82f67 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 23 Jan 2019 14:15:37 +0700 Subject: [PATCH 11/49] Fix retry limit break up db container is up --- bin/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/build.sh b/bin/build.sh index 47f331d..fc345ea 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -121,6 +121,8 @@ if [[ ${RESPONSE:0:8} != "Magento/" ]]; then COMPOSE_HTTP_TIMEOUT=200 docker-compose up -d COUNT_OUT_LIMIT=100 RETRY_LIMIT=$(( RETRY_LIMIT - 1 )) + else + break fi if [ $RETRY_LIMIT -lt 1 ]; then echo "Error with db logs:" From df46d06edf2003518da4dd4cc82f71ce501a569a Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 24 Jan 2019 16:07:17 +0700 Subject: [PATCH 12/49] Update mysql percona config for magento 2.3 env --- db/Dockerfile | 4 ++++ db/conf.d/my.cnf | 15 +++++++++++++++ .../apache-2.4/docker-compose.php-7.1.yml | 2 ++ .../apache-2.4/docker-compose.php-7.2.yml | 2 ++ .../nginx-1.8/docker-compose.php-7.1.yml | 2 ++ .../nginx-1.8/docker-compose.php-7.2.yml | 2 ++ 6 files changed, 27 insertions(+) create mode 100644 db/Dockerfile create mode 100644 db/conf.d/my.cnf diff --git a/db/Dockerfile b/db/Dockerfile new file mode 100644 index 0000000..a7cb474 --- /dev/null +++ b/db/Dockerfile @@ -0,0 +1,4 @@ +FROM percona/percona-server:5.7 + +# Copy data to image +COPY --chown=mysql:mysql mysql /var/lib/mysql diff --git a/db/conf.d/my.cnf b/db/conf.d/my.cnf new file mode 100644 index 0000000..e2ae9d4 --- /dev/null +++ b/db/conf.d/my.cnf @@ -0,0 +1,15 @@ +[mysqld] +innodb_buffer_pool_size = 2048M +innodb_buffer_pool_instances = 2 +innodb_read_io_threads = 8 +innodb_write_io_threads = 8 +thread_cache_size = 20 +key_buffer_size = 128M +query_cache_limit = 10M +query_cache_size = 10M +innodb_log_file_size = 512M +innodb_log_files_in_group = 1 +innodb_log_buffer_size = 64M +innodb_flush_method=O_DIRECT +innodb_flush_log_at_trx_commit=0 +innodb_file_per_table \ No newline at end of file diff --git a/magento-2.3.0/apache-2.4/docker-compose.php-7.1.yml b/magento-2.3.0/apache-2.4/docker-compose.php-7.1.yml index 285ada9..56c8d0e 100644 --- a/magento-2.3.0/apache-2.4/docker-compose.php-7.1.yml +++ b/magento-2.3.0/apache-2.4/docker-compose.php-7.1.yml @@ -15,6 +15,8 @@ services: image: magestore/mftf-db:percona-5.7 environment: MYSQL_ROOT_PASSWORD: magento + volumes: + - ./../db/conf.d:/etc/my.cnf.d networks: - webnet diff --git a/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml b/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml index 09c8cc4..897c0af 100644 --- a/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml +++ b/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml @@ -15,6 +15,8 @@ services: image: magestore/mftf-db:percona-5.7 environment: MYSQL_ROOT_PASSWORD: magento + volumes: + - ./../db/conf.d:/etc/my.cnf.d networks: - webnet diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml index 11e1c18..0954f64 100644 --- a/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml @@ -15,6 +15,8 @@ services: image: magestore/mftf-db:percona-5.7 environment: MYSQL_ROOT_PASSWORD: magento + volumes: + - ./../db/conf.d:/etc/my.cnf.d networks: - webnet diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml index 463d7ef..7960879 100644 --- a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml @@ -15,6 +15,8 @@ services: image: magestore/mftf-db:percona-5.7 environment: MYSQL_ROOT_PASSWORD: magento + volumes: + - ./../db/conf.d:/etc/my.cnf.d networks: - webnet From b3866fbb6386beb7a28ee9506829f4834e9912c0 Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 24 Jan 2019 16:51:45 +0700 Subject: [PATCH 13/49] Add open port 443 --- magento-2.3.0/apache-2.4/docker-compose.php-7.1.yml | 1 + magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml | 1 + magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml | 1 + magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/magento-2.3.0/apache-2.4/docker-compose.php-7.1.yml b/magento-2.3.0/apache-2.4/docker-compose.php-7.1.yml index 56c8d0e..2495712 100644 --- a/magento-2.3.0/apache-2.4/docker-compose.php-7.1.yml +++ b/magento-2.3.0/apache-2.4/docker-compose.php-7.1.yml @@ -6,6 +6,7 @@ services: - ./server/app/code/Magestore:/var/www/html/app/code/Magestore ports: - 8080-8089:80 + - 8180-8189:443 networks: webnet: aliases: diff --git a/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml b/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml index 897c0af..4a60cf8 100644 --- a/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml +++ b/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml @@ -6,6 +6,7 @@ services: - ./server/app/code/Magestore:/var/www/html/app/code/Magestore ports: - 8080-8089:80 + - 8180-8189:443 networks: webnet: aliases: diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml index 0954f64..96f51b0 100644 --- a/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml @@ -6,6 +6,7 @@ services: - ./server/app/code/Magestore:/var/www/html/app/code/Magestore ports: - 8080-8089:80 + - 8180-8189:443 networks: webnet: aliases: diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml index 7960879..1f8eeda 100644 --- a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml @@ -6,6 +6,7 @@ services: - ./server/app/code/Magestore:/var/www/html/app/code/Magestore ports: - 8080-8089:80 + - 8180-8189:443 networks: webnet: aliases: From 619d060e5af56c10bdfafc03248118913d633a7b Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 26 Jan 2019 13:10:39 +0700 Subject: [PATCH 14/49] Change magento 2.3.0 nginx 1.8 with less database --- magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml index 1f8eeda..3c06eff 100644 --- a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml @@ -13,7 +13,7 @@ services: - localhost.com db: - image: magestore/mftf-db:percona-5.7 + image: magestore/mftf-db:percona-5.7-lessdata environment: MYSQL_ROOT_PASSWORD: magento volumes: From 1e48614d29f8b3c16351f850686789993c3890b1 Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 26 Jan 2019 14:35:23 +0700 Subject: [PATCH 15/49] Add mem limit to docker --- magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml index 3c06eff..3000ea5 100644 --- a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml @@ -1,4 +1,4 @@ -version: '3' +version: '2.1' services: magento: image: magestore/mftf:2.3.0-nginx-php7.2.13 @@ -11,6 +11,8 @@ services: webnet: aliases: - localhost.com + mem_limit: 3GB + memswap_limit: 0 db: image: magestore/mftf-db:percona-5.7-lessdata @@ -20,6 +22,8 @@ services: - ./../db/conf.d:/etc/my.cnf.d networks: - webnet + mem_limit: 3GB + memswap_limit: 0 phpmyadmin: image: phpmyadmin/phpmyadmin From bb30d80020390d5a443b2646c2d6c9816db6e633 Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 26 Jan 2019 15:10:09 +0700 Subject: [PATCH 16/49] change nginx magento base url --- magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml index 3000ea5..4572d26 100644 --- a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml @@ -11,6 +11,9 @@ services: webnet: aliases: - localhost.com + environment: + BASE_URL: / + MAGENTO_DEV_MODE: developer mem_limit: 3GB memswap_limit: 0 From a7c0e70b296b510bbc608927dd85aea796405f04 Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 26 Jan 2019 18:06:18 +0700 Subject: [PATCH 17/49] New build to check magento install --- bin/build.sh | 133 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 92 insertions(+), 41 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index fc345ea..7e9de47 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -35,7 +35,7 @@ else git fetch --depth 1 origin +refs/$GITHUB_BRANCH/merge fi git checkout FETCH_HEAD - +rm -rf .git if [ $? -ne 0 ]; then exit 1 fi @@ -69,22 +69,63 @@ do sleep 3 done -PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` -MAGENTO_URL="http://$NODE_IP:$PORT" - # Check magento installation -COUNT_LIMIT=240 # timeout 600 seconds -while ! RESPONSE=`docker-compose exec -T magento curl -s https://localhost.com/magento_version` +# COUNT_LIMIT=240 # timeout 600 seconds +# while ! RESPONSE=`docker-compose exec -T magento curl -s https://localhost.com/magento_version` +# do +# if [ $COUNT_LIMIT -lt 1 ]; then +# break +# fi +# COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) +# sleep 5 +# done + +# Wait for magento setup start +#var/.maintenance.flag +TIME_OUT=10 # seconds +while [ -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] +do + if [ $TIME_OUT -lt 1 ]; then + echo "Something error:==========" + docker-compose ps + echo "See logs:=================" + docker-compose logs + exit 1 + #reak + fi + TIME_OUT=$(( TIME_OUT - 1 )) + sleep 1 +done + +# Wait for magento setup stop +COUNT_LIMIT=1000 # timeout 3000 seconds +while [ ! -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] do if [ $COUNT_LIMIT -lt 1 ]; then break fi COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) - sleep 5 + sleep 3 done -# Wait for complately magento installation -COUNT_LIMIT=1000 # timeout 3000 seconds +#check maintenance flag +! `docker-compose exec -T magento [ -f var/.maintenance.flag ]` || bash -c "\ + echo 'Magento is maintenance mode try to restart container'; \ + COMPOSE_HTTP_TIMEOUT=200 docker-compose restart magento " + +# Wait for magento setup start +TIME_OUT=10 # seconds +while [ -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] +do + if [ $TIME_OUT -lt 1 ]; then + break + fi + TIME_OUT=$(( TIME_OUT - 1 )) + sleep 1 +done + +# Wait for magento setup stop +COUNT_LIMIT=1000 # seconds while [ ! -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] do if [ $COUNT_LIMIT -lt 1 ]; then @@ -94,45 +135,55 @@ do sleep 3 done +sleep 3 +# Check magento installation +COUNT_LIMIT=2 # timeout 600 seconds +while ! RESPONSE=`docker-compose exec -T magento curl -s https://localhost.com/magento_version` +do + if [ $COUNT_LIMIT -lt 1 ]; then + break + fi + COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) + sleep 3 +done + +if [[ ${RESPONSE:0:8} != "Magento/" ]]; then + echo "Cannot setup magento" + exit 1 +fi + +# recheck and wait for db is up # if [[ ${RESPONSE:0:8} != "Magento/" ]]; then -# docker-compose restart magento +# COMPOSE_HTTP_TIMEOUT=200 docker-compose restart magento # PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` # MAGENTO_URL="http://$NODE_IP:$PORT" -# while ! RESPONSE=`docker-compose exec -T magento curl -s https://localhost.com/magento_version` +# RETRY_LIMIT=1 # retry 1 loop +# COUNT_OUT_LIMIT=100 # timeout 300 seconds +# while ! docker-compose exec -T magento curl -s https://localhost.com/magento_version # do -# sleep 5 +# COUNT_OUT_LIMIT=$(( COUNT_OUT_LIMIT - 1 )) +# if [ $COUNT_OUT_LIMIT -lt 1 ]; then +# # if database cannot start or error try to restart it +# if [ -z "$(docker-compose ps | grep 3306 | grep Up)" ]; then +# docker-compose rm db # remove stopped container +# COMPOSE_HTTP_TIMEOUT=200 docker-compose up -d +# COUNT_OUT_LIMIT=100 +# RETRY_LIMIT=$(( RETRY_LIMIT - 1 )) +# else +# break +# fi +# if [ $RETRY_LIMIT -lt 1 ]; then +# echo "Error with db logs:" +# docker-compose logs db +# exit 1 +# fi +# fi +# sleep 3 # done # fi -# recheck and wait for db is up -if [[ ${RESPONSE:0:8} != "Magento/" ]]; then - COMPOSE_HTTP_TIMEOUT=200 docker-compose restart magento - PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` - MAGENTO_URL="http://$NODE_IP:$PORT" - RETRY_LIMIT=1 # retry 1 loop - COUNT_OUT_LIMIT=100 # timeout 300 seconds - while ! docker-compose exec -T magento curl -s https://localhost.com/magento_version - do - COUNT_OUT_LIMIT=$(( COUNT_OUT_LIMIT - 1 )) - if [ $COUNT_OUT_LIMIT -lt 1 ]; then - # if database cannot start or error try to restart it - if [ -z "$(docker-compose ps | grep 3306 | grep Up)" ]; then - docker-compose rm db # remove stopped container - COMPOSE_HTTP_TIMEOUT=200 docker-compose up -d - COUNT_OUT_LIMIT=100 - RETRY_LIMIT=$(( RETRY_LIMIT - 1 )) - else - break - fi - if [ $RETRY_LIMIT -lt 1 ]; then - echo "Error with db logs:" - docker-compose logs db - exit 1 - fi - fi - sleep 3 - done -fi +PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` +MAGENTO_URL="http://$NODE_IP:$PORT" # Correct magento url docker-compose exec -u www-data -T magento bash -c \ From a5e97a87d739dbd855d207abf52aa417efddeb9b Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 27 Jan 2019 10:42:40 +0700 Subject: [PATCH 18/49] Debug build --- bin/build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index 7e9de47..6e5af85 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -147,7 +147,11 @@ do sleep 3 done -if [[ ${RESPONSE:0:8} != "Magento/" ]]; then + +echo "Debug" +sleep 2000 + +if [[ "${RESPONSE:0:8}" != "Magento/" ]]; then echo "Cannot setup magento" exit 1 fi From 2d101c4837b41ff5f40df6a63e41c7b056391106 Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 27 Jan 2019 11:38:37 +0700 Subject: [PATCH 19/49] Update build script --- bin/build.sh | 124 +++++++++++------- bin/nginx-entrypoint | 6 + .../nginx-1.8/docker-compose.php-7.2.yml | 3 + 3 files changed, 87 insertions(+), 46 deletions(-) create mode 100644 bin/nginx-entrypoint diff --git a/bin/build.sh b/bin/build.sh index 6e5af85..28047cd 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -69,6 +69,28 @@ do sleep 3 done +echo "Wait for mysql work" +COMPOSE_HTTP_TIMEOUT=200 docker-compose exec -T magento php mysql.php + +# Install magento +MAGENTO_CMD='php bin/magento setup:install --use-rewrites=1 ' +MAGENTO_CMD+='--db-host=db ' +MAGENTO_CMD+='--db-name=magento ' +MAGENTO_CMD+='--db-password=magento ' +MAGENTO_CMD+='--db-prefix=m_ ' +MAGENTO_CMD+="--admin-firstname=Admin " +MAGENTO_CMD+="--admin-lastname=MFTF " +MAGENTO_CMD+="--admin-email=admin@localhost.com " +MAGENTO_CMD+="--admin-user=admin " +MAGENTO_CMD+="--admin-password=admin123 " +MAGENTO_CMD+="--base-url=\$BASE_URL " +MAGENTO_CMD+="--backend-frontname=admin " +MAGENTO_CMD+="--admin-use-security-key=0 " +MAGENTO_CMD+="--key=8f1e9249ca82c072122ae8d08bc0b0cf " + +echo "Install magento" +docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" + # Check magento installation # COUNT_LIMIT=240 # timeout 600 seconds # while ! RESPONSE=`docker-compose exec -T magento curl -s https://localhost.com/magento_version` @@ -80,33 +102,33 @@ done # sleep 5 # done -# Wait for magento setup start -#var/.maintenance.flag -TIME_OUT=10 # seconds -while [ -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] -do - if [ $TIME_OUT -lt 1 ]; then - echo "Something error:==========" - docker-compose ps - echo "See logs:=================" - docker-compose logs - exit 1 - #reak - fi - TIME_OUT=$(( TIME_OUT - 1 )) - sleep 1 -done +# echo "Wait for magento setup start" +# #var/.maintenance.flag +# TIME_OUT=10 # seconds +# while [ -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] +# do +# if [ $TIME_OUT -lt 1 ]; then +# echo "Something error:==========" +# docker-compose ps +# echo "See logs:=================" +# docker-compose logs +# exit 1 +# #reak +# fi +# TIME_OUT=$(( TIME_OUT - 1 )) +# sleep 1 +# done -# Wait for magento setup stop -COUNT_LIMIT=1000 # timeout 3000 seconds -while [ ! -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] -do - if [ $COUNT_LIMIT -lt 1 ]; then - break - fi - COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) - sleep 3 -done +# echo "Wait for magento setup stop" +# COUNT_LIMIT=1000 # timeout 3000 seconds +# while [ ! -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] +# do +# if [ $COUNT_LIMIT -lt 1 ]; then +# break +# fi +# COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) +# sleep 3 +# done #check maintenance flag ! `docker-compose exec -T magento [ -f var/.maintenance.flag ]` || bash -c "\ @@ -114,29 +136,29 @@ done COMPOSE_HTTP_TIMEOUT=200 docker-compose restart magento " # Wait for magento setup start -TIME_OUT=10 # seconds -while [ -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] -do - if [ $TIME_OUT -lt 1 ]; then - break - fi - TIME_OUT=$(( TIME_OUT - 1 )) - sleep 1 -done +# TIME_OUT=10 # seconds +# while [ -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] +# do +# if [ $TIME_OUT -lt 1 ]; then +# break +# fi +# TIME_OUT=$(( TIME_OUT - 1 )) +# sleep 1 +# done # Wait for magento setup stop -COUNT_LIMIT=1000 # seconds -while [ ! -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] -do - if [ $COUNT_LIMIT -lt 1 ]; then - break - fi - COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) - sleep 3 -done +# COUNT_LIMIT=1000 # seconds +# while [ ! -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] +# do +# if [ $COUNT_LIMIT -lt 1 ]; then +# break +# fi +# COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) +# sleep 3 +# done sleep 3 -# Check magento installation +echo "Check magento installation" COUNT_LIMIT=2 # timeout 600 seconds while ! RESPONSE=`docker-compose exec -T magento curl -s https://localhost.com/magento_version` do @@ -149,7 +171,7 @@ done echo "Debug" -sleep 2000 +sleep 300 if [[ "${RESPONSE:0:8}" != "Magento/" ]]; then echo "Cannot setup magento" @@ -189,6 +211,16 @@ fi PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` MAGENTO_URL="http://$NODE_IP:$PORT" +# Upgrade module (if needed) +MAGENTO_CMD='php bin/magento setup:upgrade ' +docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" + +# Update config for testing +MAGENTO_CMD='php bin/magento config:set cms/wysiwyg/enabled disabled ' +MAGENTO_CMD+='&& php bin/magento config:set admin/security/admin_account_sharing 1 ' +MAGENTO_CMD+='&& php bin/magento config:set admin/captcha/enable 0 ' +docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" + # Correct magento url docker-compose exec -u www-data -T magento bash -c \ "php bin/magento setup:store-config:set \ diff --git a/bin/nginx-entrypoint b/bin/nginx-entrypoint new file mode 100644 index 0000000..c7224dd --- /dev/null +++ b/bin/nginx-entrypoint @@ -0,0 +1,6 @@ +#!/bin/bash + +# Start php-fpm +php-fpm -y /usr/local/etc/php-fpm.conf -D +# Start nginx +nginx -g "daemon off;" diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml index 4572d26..b9ea901 100644 --- a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml @@ -4,6 +4,7 @@ services: image: magestore/mftf:2.3.0-nginx-php7.2.13 volumes: - ./server/app/code/Magestore:/var/www/html/app/code/Magestore + - ../bin/nginx-entrypoint:/usr/local/bin/nginx-entrypoint ports: - 8080-8089:80 - 8180-8189:443 @@ -16,6 +17,8 @@ services: MAGENTO_DEV_MODE: developer mem_limit: 3GB memswap_limit: 0 + entrypoint: + - nginx-entrypoint db: image: magestore/mftf-db:percona-5.7-lessdata From a538558ae76e2ade1e8191fbaf6534b13e4227b2 Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 27 Jan 2019 11:51:50 +0700 Subject: [PATCH 20/49] add mode exec --- bin/nginx-entrypoint | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/nginx-entrypoint diff --git a/bin/nginx-entrypoint b/bin/nginx-entrypoint old mode 100644 new mode 100755 From 2ba2a594e84d088ceaa1a0b74320c0ded4088b91 Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 27 Jan 2019 12:08:41 +0700 Subject: [PATCH 21/49] Update build --- bin/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 28047cd..eb69c92 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -73,6 +73,8 @@ echo "Wait for mysql work" COMPOSE_HTTP_TIMEOUT=200 docker-compose exec -T magento php mysql.php # Install magento +echo "Install magento" +set +x MAGENTO_CMD='php bin/magento setup:install --use-rewrites=1 ' MAGENTO_CMD+='--db-host=db ' MAGENTO_CMD+='--db-name=magento ' @@ -87,8 +89,7 @@ MAGENTO_CMD+="--base-url=\$BASE_URL " MAGENTO_CMD+="--backend-frontname=admin " MAGENTO_CMD+="--admin-use-security-key=0 " MAGENTO_CMD+="--key=8f1e9249ca82c072122ae8d08bc0b0cf " - -echo "Install magento" +set +x docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" # Check magento installation From e67b3d4e49e23644cf885eb1c84146eec1ff4ffc Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 27 Jan 2019 12:18:54 +0700 Subject: [PATCH 22/49] Update build --- bin/build.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index eb69c92..d62aff5 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -75,20 +75,20 @@ COMPOSE_HTTP_TIMEOUT=200 docker-compose exec -T magento php mysql.php # Install magento echo "Install magento" set +x -MAGENTO_CMD='php bin/magento setup:install --use-rewrites=1 ' -MAGENTO_CMD+='--db-host=db ' -MAGENTO_CMD+='--db-name=magento ' -MAGENTO_CMD+='--db-password=magento ' -MAGENTO_CMD+='--db-prefix=m_ ' -MAGENTO_CMD+="--admin-firstname=Admin " -MAGENTO_CMD+="--admin-lastname=MFTF " -MAGENTO_CMD+="--admin-email=admin@localhost.com " -MAGENTO_CMD+="--admin-user=admin " -MAGENTO_CMD+="--admin-password=admin123 " -MAGENTO_CMD+="--base-url=\$BASE_URL " -MAGENTO_CMD+="--backend-frontname=admin " -MAGENTO_CMD+="--admin-use-security-key=0 " -MAGENTO_CMD+="--key=8f1e9249ca82c072122ae8d08bc0b0cf " +MAGENTO_CMD='php bin/magento setup:install --use-rewrites=1 \ +--db-host=db \ +--db-name=magento \ +--db-password=magento \ +--db-prefix=m_ \ +--admin-firstname=Admin \ +--admin-lastname=MFTF \ +--admin-email=admin@localhost.com \ +--admin-user=admin \ +--admin-password=admin123 \ +--base-url=$BASE_URL \ +--backend-frontname=admin \ +--admin-use-security-key=0 \ +--key=8f1e9249ca82c072122ae8d08bc0b0cf ' set +x docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" From f46d10aac248b6ad95ed4a7926664645152c26ca Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 27 Jan 2019 12:33:09 +0700 Subject: [PATCH 23/49] Update build & debuging --- bin/build.sh | 8 ++++---- magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index d62aff5..c9bf98b 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -42,11 +42,11 @@ fi # Build POS cd client/pos -npm install && npm run build +#npm install && npm run build cd ../.. -mkdir -p server/app/code/Magestore/Webpos/build/apps -rm -Rf server/app/code/Magestore/Webpos/build/apps/pos -cp -Rf client/pos/build server/app/code/Magestore/Webpos/build/apps/pos +#mkdir -p server/app/code/Magestore/Webpos/build/apps +#rm -Rf server/app/code/Magestore/Webpos/build/apps/pos +#cp -Rf client/pos/build server/app/code/Magestore/Webpos/build/apps/pos # Start service cp ../$COMPOSE_FILE docker-compose.yml diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml index b9ea901..e9047d0 100644 --- a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml @@ -13,7 +13,7 @@ services: aliases: - localhost.com environment: - BASE_URL: / + #BASE_URL: MAGENTO_DEV_MODE: developer mem_limit: 3GB memswap_limit: 0 From 98f31e78d1065f1077475c7880cc16ea4a8c2b87 Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 27 Jan 2019 12:43:08 +0700 Subject: [PATCH 24/49] Update build --- bin/build.sh | 4 ++-- magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index c9bf98b..a725e2f 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -89,7 +89,7 @@ MAGENTO_CMD='php bin/magento setup:install --use-rewrites=1 \ --backend-frontname=admin \ --admin-use-security-key=0 \ --key=8f1e9249ca82c072122ae8d08bc0b0cf ' -set +x +set -x docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" # Check magento installation @@ -132,7 +132,7 @@ docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" # done #check maintenance flag -! `docker-compose exec -T magento [ -f var/.maintenance.flag ]` || bash -c "\ +! `docker-compose exec -T magento [ -f var/.maintenance.flag ]` || sh -c "\ echo 'Magento is maintenance mode try to restart container'; \ COMPOSE_HTTP_TIMEOUT=200 docker-compose restart magento " diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml index e9047d0..8991005 100644 --- a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml @@ -3,7 +3,7 @@ services: magento: image: magestore/mftf:2.3.0-nginx-php7.2.13 volumes: - - ./server/app/code/Magestore:/var/www/html/app/code/Magestore + #- ./server/app/code/Magestore:/var/www/html/app/code/Magestore - ../bin/nginx-entrypoint:/usr/local/bin/nginx-entrypoint ports: - 8080-8089:80 From 2dede0614ba23bc37bd43033f09a40ba6061d3df Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 27 Jan 2019 15:49:36 +0700 Subject: [PATCH 25/49] Update build --- magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml index 8991005..a14e54d 100644 --- a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml @@ -13,7 +13,7 @@ services: aliases: - localhost.com environment: - #BASE_URL: + BASE_URL: https://localhost.com/ MAGENTO_DEV_MODE: developer mem_limit: 3GB memswap_limit: 0 From bc5a6952313fd326a72eafdec8656f622278932d Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 27 Jan 2019 16:10:19 +0700 Subject: [PATCH 26/49] Update build --- bin/build.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index a725e2f..eecd699 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -161,7 +161,7 @@ docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" sleep 3 echo "Check magento installation" COUNT_LIMIT=2 # timeout 600 seconds -while ! RESPONSE=`docker-compose exec -T magento curl -s https://localhost.com/magento_version` +while ! RESPONSE=`docker-compose exec -T magento curl -s localhost.com/magento_version` do if [ $COUNT_LIMIT -lt 1 ]; then break @@ -170,10 +170,6 @@ do sleep 3 done - -echo "Debug" -sleep 300 - if [[ "${RESPONSE:0:8}" != "Magento/" ]]; then echo "Cannot setup magento" exit 1 @@ -212,8 +208,17 @@ fi PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` MAGENTO_URL="http://$NODE_IP:$PORT" +# Correct magento url +docker-compose exec -u www-data -T magento bash -c \ + "php bin/magento setup:store-config:set \ + --admin-use-security-key=0 \ + --base-url=$MAGENTO_URL/ " + # Upgrade module (if needed) -MAGENTO_CMD='php bin/magento setup:upgrade ' +# install POS +echo "Install POS modules:" +docker-compose run -T -v "$PWD/server/app/code/Magestore:/var/www/html/app/code/Magestore" magento +MAGENTO_CMD='php bin/magento setup:upgrade && php bin/magento webpos:deploy' docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" # Update config for testing @@ -222,8 +227,3 @@ MAGENTO_CMD+='&& php bin/magento config:set admin/security/admin_account_sharing MAGENTO_CMD+='&& php bin/magento config:set admin/captcha/enable 0 ' docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" -# Correct magento url -docker-compose exec -u www-data -T magento bash -c \ - "php bin/magento setup:store-config:set \ - --admin-use-security-key=0 \ - --base-url=$MAGENTO_URL/ " From ea99fd67e2efff5ff8a5a1a830b6488e6a528977 Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 27 Jan 2019 16:19:22 +0700 Subject: [PATCH 27/49] Update build --- bin/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index eecd699..4836674 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -160,7 +160,7 @@ docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" sleep 3 echo "Check magento installation" -COUNT_LIMIT=2 # timeout 600 seconds +COUNT_LIMIT=10 # timeout 600 seconds while ! RESPONSE=`docker-compose exec -T magento curl -s localhost.com/magento_version` do if [ $COUNT_LIMIT -lt 1 ]; then @@ -172,6 +172,7 @@ done if [[ "${RESPONSE:0:8}" != "Magento/" ]]; then echo "Cannot setup magento" + sleep 1000 exit 1 fi From 8119b03b864b2c019f7779c1b799350c277081d1 Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 27 Jan 2019 17:27:24 +0700 Subject: [PATCH 28/49] Update build --- bin/build.sh | 2 +- magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 4836674..3df0402 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -161,7 +161,7 @@ docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" sleep 3 echo "Check magento installation" COUNT_LIMIT=10 # timeout 600 seconds -while ! RESPONSE=`docker-compose exec -T magento curl -s localhost.com/magento_version` +while ! RESPONSE=`docker-compose exec -T magento curl -s localhost/magento_version` do if [ $COUNT_LIMIT -lt 1 ]; then break diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml index a14e54d..58d65fc 100644 --- a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml @@ -13,7 +13,7 @@ services: aliases: - localhost.com environment: - BASE_URL: https://localhost.com/ + BASE_URL: http://localhost/ MAGENTO_DEV_MODE: developer mem_limit: 3GB memswap_limit: 0 From a18bd091c4d17f21d77c2dee3b95e4ce759492b3 Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 27 Jan 2019 17:55:15 +0700 Subject: [PATCH 29/49] Update build: auto add volume --- bin/build.sh | 4 +++- magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index 3df0402..b79454b 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -218,7 +218,9 @@ docker-compose exec -u www-data -T magento bash -c \ # Upgrade module (if needed) # install POS echo "Install POS modules:" -docker-compose run -T -v "$PWD/server/app/code/Magestore:/var/www/html/app/code/Magestore" magento +sed -i -s 's/#AUTO_ADD_VOLUME_server_app_code_Magestore/- \.\/server\/app\/code\/Magestore:\/var\/www\/html\/app\/code\/Magestore/g' docker-compose.yml +docker-compose up -d +sleep 1 MAGENTO_CMD='php bin/magento setup:upgrade && php bin/magento webpos:deploy' docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml index 58d65fc..0961721 100644 --- a/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.2.yml @@ -4,6 +4,7 @@ services: image: magestore/mftf:2.3.0-nginx-php7.2.13 volumes: #- ./server/app/code/Magestore:/var/www/html/app/code/Magestore + #AUTO_ADD_VOLUME_server_app_code_Magestore - ../bin/nginx-entrypoint:/usr/local/bin/nginx-entrypoint ports: - 8080-8089:80 From 10f510f3f3d72b597b1a9660892a24f8500cd663 Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 27 Jan 2019 18:02:05 +0700 Subject: [PATCH 30/49] Update build --- bin/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index b79454b..9e7186a 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -218,15 +218,15 @@ docker-compose exec -u www-data -T magento bash -c \ # Upgrade module (if needed) # install POS echo "Install POS modules:" -sed -i -s 's/#AUTO_ADD_VOLUME_server_app_code_Magestore/- \.\/server\/app\/code\/Magestore:\/var\/www\/html\/app\/code\/Magestore/g' docker-compose.yml +sed -i 's/#AUTO_ADD_VOLUME_server_app_code_Magestore/- \.\/server\/app\/code\/Magestore:\/var\/www\/html\/app\/code\/Magestore/g' docker-compose.yml docker-compose up -d sleep 1 MAGENTO_CMD='php bin/magento setup:upgrade && php bin/magento webpos:deploy' docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" # Update config for testing -MAGENTO_CMD='php bin/magento config:set cms/wysiwyg/enabled disabled ' -MAGENTO_CMD+='&& php bin/magento config:set admin/security/admin_account_sharing 1 ' -MAGENTO_CMD+='&& php bin/magento config:set admin/captcha/enable 0 ' +MAGENTO_CMD='php bin/magento config:set cms/wysiwyg/enabled disabled \ +&& php bin/magento config:set admin/security/admin_account_sharing 1 \ +&& php bin/magento config:set admin/captcha/enable 0 ' docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" From d4f17a832d6276c47ee00acf2a1a45d96f3881fc Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 27 Jan 2019 18:12:37 +0700 Subject: [PATCH 31/49] Update build --- bin/build.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 9e7186a..9bd46ee 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -220,9 +220,12 @@ docker-compose exec -u www-data -T magento bash -c \ echo "Install POS modules:" sed -i 's/#AUTO_ADD_VOLUME_server_app_code_Magestore/- \.\/server\/app\/code\/Magestore:\/var\/www\/html\/app\/code\/Magestore/g' docker-compose.yml docker-compose up -d -sleep 1 -MAGENTO_CMD='php bin/magento setup:upgrade && php bin/magento webpos:deploy' -docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" + +# Wait for server +sleep 5 + +docker-compose exec -u www-data -T magento bash -c "php bin/magento setup:upgrade" +docker-compose exec -u www-data -T magento bash -c "php bin/magento webpos:deploy" # Update config for testing MAGENTO_CMD='php bin/magento config:set cms/wysiwyg/enabled disabled \ From c067c29b1d11875a64b1e8de10451f7c6f0cc024 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 28 Jan 2019 11:17:48 +0700 Subject: [PATCH 32/49] Update build --- bin/build.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 9bd46ee..8ab2efa 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -219,17 +219,28 @@ docker-compose exec -u www-data -T magento bash -c \ # install POS echo "Install POS modules:" sed -i 's/#AUTO_ADD_VOLUME_server_app_code_Magestore/- \.\/server\/app\/code\/Magestore:\/var\/www\/html\/app\/code\/Magestore/g' docker-compose.yml -docker-compose up -d +docker-compose up -d magento # Wait for server sleep 5 +COUNT_LIMIT=10 # timeout 600 seconds +while ! RESPONSE=`docker-compose exec -T magento curl -s localhost/magento_version` +do + if [ $COUNT_LIMIT -lt 1 ]; then + echo "Server magento doesn't work" + sleep 1000 # debuging + exit 1 + fi + COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) + sleep 3 +done docker-compose exec -u www-data -T magento bash -c "php bin/magento setup:upgrade" docker-compose exec -u www-data -T magento bash -c "php bin/magento webpos:deploy" # Update config for testing -MAGENTO_CMD='php bin/magento config:set cms/wysiwyg/enabled disabled \ -&& php bin/magento config:set admin/security/admin_account_sharing 1 \ -&& php bin/magento config:set admin/captcha/enable 0 ' +MAGENTO_CMD='php bin/magento config:set cms/wysiwyg/enabled disabled ; \ +php bin/magento config:set admin/security/admin_account_sharing 1 ; \ +php bin/magento config:set admin/captcha/enable 0 ' docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" From 8f95e188f65d7950969efe515fd8b880fcf13e75 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 28 Jan 2019 13:35:34 +0700 Subject: [PATCH 33/49] Update build --- bin/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/build.sh b/bin/build.sh index 8ab2efa..7b0f3fe 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -234,6 +234,8 @@ do COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) sleep 3 done +echo "Wait for mysql work" +COMPOSE_HTTP_TIMEOUT=200 docker-compose exec -T magento php mysql.php docker-compose exec -u www-data -T magento bash -c "php bin/magento setup:upgrade" docker-compose exec -u www-data -T magento bash -c "php bin/magento webpos:deploy" From 3ceb9b89c0dcb212ef7b995be0a1cb05d2c320a5 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 28 Jan 2019 13:55:21 +0700 Subject: [PATCH 34/49] Update build: debug --- bin/build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/build.sh b/bin/build.sh index 7b0f3fe..024bd89 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -234,6 +234,10 @@ do COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) sleep 3 done + + +sleep 100000 + echo "Wait for mysql work" COMPOSE_HTTP_TIMEOUT=200 docker-compose exec -T magento php mysql.php From be927390a2dc915e2e4bce336dba468dc1325ac6 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 28 Jan 2019 14:13:02 +0700 Subject: [PATCH 35/49] Update build --- bin/build.sh | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 024bd89..7d33bc3 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -206,41 +206,24 @@ fi # done # fi -PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` -MAGENTO_URL="http://$NODE_IP:$PORT" - -# Correct magento url -docker-compose exec -u www-data -T magento bash -c \ - "php bin/magento setup:store-config:set \ - --admin-use-security-key=0 \ - --base-url=$MAGENTO_URL/ " - # Upgrade module (if needed) # install POS echo "Install POS modules:" sed -i 's/#AUTO_ADD_VOLUME_server_app_code_Magestore/- \.\/server\/app\/code\/Magestore:\/var\/www\/html\/app\/code\/Magestore/g' docker-compose.yml docker-compose up -d magento -# Wait for server -sleep 5 -COUNT_LIMIT=10 # timeout 600 seconds -while ! RESPONSE=`docker-compose exec -T magento curl -s localhost/magento_version` -do - if [ $COUNT_LIMIT -lt 1 ]; then - echo "Server magento doesn't work" - sleep 1000 # debuging - exit 1 - fi - COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) - sleep 3 -done - - -sleep 100000 - echo "Wait for mysql work" COMPOSE_HTTP_TIMEOUT=200 docker-compose exec -T magento php mysql.php +PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` +MAGENTO_URL="http://$NODE_IP:$PORT" + +# Correct magento url +docker-compose exec -u www-data -T magento bash -c \ + "php bin/magento setup:store-config:set \ + --admin-use-security-key=0 \ + --base-url=$MAGENTO_URL/ " + docker-compose exec -u www-data -T magento bash -c "php bin/magento setup:upgrade" docker-compose exec -u www-data -T magento bash -c "php bin/magento webpos:deploy" From b733a7b04efa7dd5ea93b0e1bc4ab70440209a20 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 28 Jan 2019 14:21:58 +0700 Subject: [PATCH 36/49] Update build debug --- bin/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/build.sh b/bin/build.sh index 7d33bc3..9e032b1 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -218,6 +218,8 @@ COMPOSE_HTTP_TIMEOUT=200 docker-compose exec -T magento php mysql.php PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` MAGENTO_URL="http://$NODE_IP:$PORT" +sleep 10000 + # Correct magento url docker-compose exec -u www-data -T magento bash -c \ "php bin/magento setup:store-config:set \ From 0e3799df33c5291bdf99bf3b6bba78456aafc607 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 28 Jan 2019 14:56:25 +0700 Subject: [PATCH 37/49] Update build --- bin/build.sh | 101 ++------------------------------------------------- 1 file changed, 4 insertions(+), 97 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 9e032b1..0179d04 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -92,72 +92,11 @@ MAGENTO_CMD='php bin/magento setup:install --use-rewrites=1 \ set -x docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" -# Check magento installation -# COUNT_LIMIT=240 # timeout 600 seconds -# while ! RESPONSE=`docker-compose exec -T magento curl -s https://localhost.com/magento_version` -# do -# if [ $COUNT_LIMIT -lt 1 ]; then -# break -# fi -# COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) -# sleep 5 -# done - -# echo "Wait for magento setup start" -# #var/.maintenance.flag -# TIME_OUT=10 # seconds -# while [ -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] -# do -# if [ $TIME_OUT -lt 1 ]; then -# echo "Something error:==========" -# docker-compose ps -# echo "See logs:=================" -# docker-compose logs -# exit 1 -# #reak -# fi -# TIME_OUT=$(( TIME_OUT - 1 )) -# sleep 1 -# done - -# echo "Wait for magento setup stop" -# COUNT_LIMIT=1000 # timeout 3000 seconds -# while [ ! -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] -# do -# if [ $COUNT_LIMIT -lt 1 ]; then -# break -# fi -# COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) -# sleep 3 -# done - #check maintenance flag ! `docker-compose exec -T magento [ -f var/.maintenance.flag ]` || sh -c "\ echo 'Magento is maintenance mode try to restart container'; \ COMPOSE_HTTP_TIMEOUT=200 docker-compose restart magento " -# Wait for magento setup start -# TIME_OUT=10 # seconds -# while [ -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] -# do -# if [ $TIME_OUT -lt 1 ]; then -# break -# fi -# TIME_OUT=$(( TIME_OUT - 1 )) -# sleep 1 -# done - -# Wait for magento setup stop -# COUNT_LIMIT=1000 # seconds -# while [ ! -z "`docker-compose exec -T magento ps auxww | grep 'bin/magento setup'`" ] -# do -# if [ $COUNT_LIMIT -lt 1 ]; then -# break -# fi -# COUNT_LIMIT=$(( COUNT_LIMIT - 1 )) -# sleep 3 -# done - sleep 3 echo "Check magento installation" COUNT_LIMIT=10 # timeout 600 seconds @@ -172,45 +111,16 @@ done if [[ "${RESPONSE:0:8}" != "Magento/" ]]; then echo "Cannot setup magento" - sleep 1000 exit 1 fi -# recheck and wait for db is up -# if [[ ${RESPONSE:0:8} != "Magento/" ]]; then -# COMPOSE_HTTP_TIMEOUT=200 docker-compose restart magento -# PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` -# MAGENTO_URL="http://$NODE_IP:$PORT" -# RETRY_LIMIT=1 # retry 1 loop -# COUNT_OUT_LIMIT=100 # timeout 300 seconds -# while ! docker-compose exec -T magento curl -s https://localhost.com/magento_version -# do -# COUNT_OUT_LIMIT=$(( COUNT_OUT_LIMIT - 1 )) -# if [ $COUNT_OUT_LIMIT -lt 1 ]; then -# # if database cannot start or error try to restart it -# if [ -z "$(docker-compose ps | grep 3306 | grep Up)" ]; then -# docker-compose rm db # remove stopped container -# COMPOSE_HTTP_TIMEOUT=200 docker-compose up -d -# COUNT_OUT_LIMIT=100 -# RETRY_LIMIT=$(( RETRY_LIMIT - 1 )) -# else -# break -# fi -# if [ $RETRY_LIMIT -lt 1 ]; then -# echo "Error with db logs:" -# docker-compose logs db -# exit 1 -# fi -# fi -# sleep 3 -# done -# fi - # Upgrade module (if needed) # install POS echo "Install POS modules:" -sed -i 's/#AUTO_ADD_VOLUME_server_app_code_Magestore/- \.\/server\/app\/code\/Magestore:\/var\/www\/html\/app\/code\/Magestore/g' docker-compose.yml -docker-compose up -d magento +#sed -i 's/#AUTO_ADD_VOLUME_server_app_code_Magestore/- \.\/server\/app\/code\/Magestore:\/var\/www\/html\/app\/code\/Magestore/g' docker-compose.yml +#docker-compose up -d magento +CONTAINER_ID=`docker-compose ps -q magento` +docker cp ./server/app/code/Magestore $CONTAINER_ID:/var/www/html/app/code/ echo "Wait for mysql work" COMPOSE_HTTP_TIMEOUT=200 docker-compose exec -T magento php mysql.php @@ -218,8 +128,6 @@ COMPOSE_HTTP_TIMEOUT=200 docker-compose exec -T magento php mysql.php PORT=`docker-compose port --protocol=tcp magento 80 | sed 's/0.0.0.0://'` MAGENTO_URL="http://$NODE_IP:$PORT" -sleep 10000 - # Correct magento url docker-compose exec -u www-data -T magento bash -c \ "php bin/magento setup:store-config:set \ @@ -234,4 +142,3 @@ MAGENTO_CMD='php bin/magento config:set cms/wysiwyg/enabled disabled ; \ php bin/magento config:set admin/security/admin_account_sharing 1 ; \ php bin/magento config:set admin/captcha/enable 0 ' docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" - From c91ee95024681c687c502ae77781457cc03681ea Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 28 Jan 2019 15:00:46 +0700 Subject: [PATCH 38/49] Update build --- bin/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 0179d04..2f8e6f9 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -42,11 +42,11 @@ fi # Build POS cd client/pos -#npm install && npm run build +npm install && npm run build cd ../.. -#mkdir -p server/app/code/Magestore/Webpos/build/apps -#rm -Rf server/app/code/Magestore/Webpos/build/apps/pos -#cp -Rf client/pos/build server/app/code/Magestore/Webpos/build/apps/pos +mkdir -p server/app/code/Magestore/Webpos/build/apps +rm -Rf server/app/code/Magestore/Webpos/build/apps/pos +cp -Rf client/pos/build server/app/code/Magestore/Webpos/build/apps/pos # Start service cp ../$COMPOSE_FILE docker-compose.yml From 2b011dbd5365477e2c76b3b549eff789831aaac9 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 28 Jan 2019 15:16:24 +0700 Subject: [PATCH 39/49] Update build --- bin/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index 2f8e6f9..2f86ac5 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -120,7 +120,7 @@ echo "Install POS modules:" #sed -i 's/#AUTO_ADD_VOLUME_server_app_code_Magestore/- \.\/server\/app\/code\/Magestore:\/var\/www\/html\/app\/code\/Magestore/g' docker-compose.yml #docker-compose up -d magento CONTAINER_ID=`docker-compose ps -q magento` -docker cp ./server/app/code/Magestore $CONTAINER_ID:/var/www/html/app/code/ +docker cp ./server/app/code/Magestore $CONTAINER_ID:/var/www/html/app/code/Magestore echo "Wait for mysql work" COMPOSE_HTTP_TIMEOUT=200 docker-compose exec -T magento php mysql.php From 7a7c83d053b7ef30a7ca4214efb8538c30aa46e0 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 28 Jan 2019 15:22:26 +0700 Subject: [PATCH 40/49] Add Magestore-Noodle/pos-enterprise repository --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4ff84c5..e3077f0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { choice(name: 'HTTP_SERVER', choices: ['apache-2.4', 'apache-2.2', 'nginx-1.8'], description: 'HTTP Server') choice(name: 'PHP_VERSION', choices: ['7.2', '7.1', '7.0', '5.6'], description: 'PHP Version') choice(name: 'MAGENTO_VERSION', choices: ['2.3.0', '2.2.7', '2.2.6', '2.1.16'], description: 'Magento Version') - choice(name: 'GITHUB_REPO', choices: ['Magestore-Noodle/pos-pro', 'magestore-shark/pos-pro', 'Magestore/pos-standard', 'Magestore/pos-pro', 'Magestore/pos-enterprise'], description: 'Github repository') + choice(name: 'GITHUB_REPO', choices: ['Magestore-Noodle/pos-enterprise', 'Magestore-Noodle/pos-pro', 'magestore-shark/pos-pro', 'Magestore/pos-standard', 'Magestore/pos-pro', 'Magestore/pos-enterprise'], description: 'Github repository') string(name: 'GITHUB_BRANCH', defaultValue: '4-develop', description: 'Github branch or pull request. Example: 3-develop, pull/3') choice(name: 'TIME_TO_LIVE', choices: ['1h', '2h', '4h', '1d', '7d'], description: 'Server living time') credentials(name: 'GITHUB_USER', description: 'Github username and password', defaultValue: 'd79f2198-246f-431c-94c5-3d2824ca8e31', credentialType: "Username with password", required: true) From 5a732c9daa6bdead652d5f7f6621f6c6f2f8a49a Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 28 Jan 2019 15:32:23 +0700 Subject: [PATCH 41/49] Update build --- bin/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index 2f86ac5..98c7537 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -120,7 +120,9 @@ echo "Install POS modules:" #sed -i 's/#AUTO_ADD_VOLUME_server_app_code_Magestore/- \.\/server\/app\/code\/Magestore:\/var\/www\/html\/app\/code\/Magestore/g' docker-compose.yml #docker-compose up -d magento CONTAINER_ID=`docker-compose ps -q magento` -docker cp ./server/app/code/Magestore $CONTAINER_ID:/var/www/html/app/code/Magestore +docker exec -i -u www-data $CONTAINER_ID mkdir -p /var/www/html/app/code +docker cp ./server/app/code/Magestore $CONTAINER_ID:/var/www/html/app/code +docker exec -i $CONTAINER_ID chown -R www-data:www-data /var/www/html/app/code/Magestore echo "Wait for mysql work" COMPOSE_HTTP_TIMEOUT=200 docker-compose exec -T magento php mysql.php From 8a7927f5561d68c05d442837fbd0cb53da2b9b5d Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 28 Jan 2019 16:33:13 +0700 Subject: [PATCH 42/49] Add entrypoint to magento server environment, lessdata for all 2.3.0 --- bin/apache-entrypoint | 4 ++++ .../apache-2.4/docker-compose.php-7.1.yml | 16 +++++++++++++--- .../apache-2.4/docker-compose.php-7.2.yml | 16 +++++++++++++--- .../nginx-1.8/docker-compose.php-7.1.yml | 16 +++++++++++++--- 4 files changed, 43 insertions(+), 9 deletions(-) create mode 100755 bin/apache-entrypoint diff --git a/bin/apache-entrypoint b/bin/apache-entrypoint new file mode 100755 index 0000000..74a1000 --- /dev/null +++ b/bin/apache-entrypoint @@ -0,0 +1,4 @@ +#!/bin/bash + +# Start apache2 +apache2-foreground diff --git a/magento-2.3.0/apache-2.4/docker-compose.php-7.1.yml b/magento-2.3.0/apache-2.4/docker-compose.php-7.1.yml index 2495712..54972d5 100644 --- a/magento-2.3.0/apache-2.4/docker-compose.php-7.1.yml +++ b/magento-2.3.0/apache-2.4/docker-compose.php-7.1.yml @@ -1,9 +1,10 @@ -version: '3' +version: '2.1' services: magento: image: magestore/mftf:2.3.0-apache-php7.1.25 volumes: - - ./server/app/code/Magestore:/var/www/html/app/code/Magestore + # - ./server/app/code/Magestore:/var/www/html/app/code/Magestore + - ../bin/apache-entrypoint:/usr/local/bin/entrypoint ports: - 8080-8089:80 - 8180-8189:443 @@ -11,15 +12,24 @@ services: webnet: aliases: - localhost.com + environment: + BASE_URL: http://localhost/ + MAGENTO_DEV_MODE: developer + mem_limit: 3GB + memswap_limit: 0 + entrypoint: + - entrypoint db: - image: magestore/mftf-db:percona-5.7 + image: magestore/mftf-db:percona-5.7-lessdata environment: MYSQL_ROOT_PASSWORD: magento volumes: - ./../db/conf.d:/etc/my.cnf.d networks: - webnet + mem_limit: 3GB + memswap_limit: 0 phpmyadmin: image: phpmyadmin/phpmyadmin diff --git a/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml b/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml index 4a60cf8..7df872b 100644 --- a/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml +++ b/magento-2.3.0/apache-2.4/docker-compose.php-7.2.yml @@ -1,9 +1,10 @@ -version: '3' +version: '2.1' services: magento: image: magestore/mftf:2.3.0-apache-php7.2.13 volumes: - - ./server/app/code/Magestore:/var/www/html/app/code/Magestore + #- ./server/app/code/Magestore:/var/www/html/app/code/Magestore + - ../bin/apache-entrypoint:/usr/local/bin/entrypoint ports: - 8080-8089:80 - 8180-8189:443 @@ -11,15 +12,24 @@ services: webnet: aliases: - localhost.com + environment: + BASE_URL: http://localhost/ + MAGENTO_DEV_MODE: developer + mem_limit: 3GB + memswap_limit: 0 + entrypoint: + - entrypoint db: - image: magestore/mftf-db:percona-5.7 + image: magestore/mftf-db:percona-5.7-lessdata environment: MYSQL_ROOT_PASSWORD: magento volumes: - ./../db/conf.d:/etc/my.cnf.d networks: - webnet + mem_limit: 3GB + memswap_limit: 0 phpmyadmin: image: phpmyadmin/phpmyadmin diff --git a/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml b/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml index 96f51b0..570e4a5 100644 --- a/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml +++ b/magento-2.3.0/nginx-1.8/docker-compose.php-7.1.yml @@ -1,9 +1,10 @@ -version: '3' +version: '2.1' services: magento: image: magestore/mftf:2.3.0-nginx-php7.1.25 volumes: - - ./server/app/code/Magestore:/var/www/html/app/code/Magestore + #- ./server/app/code/Magestore:/var/www/html/app/code/Magestore + - ../bin/nginx-entrypoint:/usr/local/bin/nginx-entrypoint ports: - 8080-8089:80 - 8180-8189:443 @@ -11,15 +12,24 @@ services: webnet: aliases: - localhost.com + environment: + BASE_URL: http://localhost/ + MAGENTO_DEV_MODE: developer + mem_limit: 3GB + memswap_limit: 0 + entrypoint: + - nginx-entrypoint db: - image: magestore/mftf-db:percona-5.7 + image: magestore/mftf-db:percona-5.7-lessdata environment: MYSQL_ROOT_PASSWORD: magento volumes: - ./../db/conf.d:/etc/my.cnf.d networks: - webnet + mem_limit: 3GB + memswap_limit: 0 phpmyadmin: image: phpmyadmin/phpmyadmin From d226f67cc1ec715ca796419b7543e6e5f32ab12c Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 28 Jan 2019 17:10:51 +0700 Subject: [PATCH 43/49] Update report hook to slack --- bin/run.sh | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/bin/run.sh b/bin/run.sh index 50e9351..0b8922f 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -15,6 +15,7 @@ if [[ -z "$PORT" ]]; then fi MAGENTO_URL="http://$NODE_IP:$PORT" +MAGENTO_SECURE_URL="http://$NODE_IP:$PORT" PORT=`docker-compose port --protocol=tcp phpmyadmin 80 | sed 's/0.0.0.0://'` PHPMYADMIN_URL="http://$NODE_IP:$PORT" @@ -28,11 +29,30 @@ echo "Server Info: $HTTP_SERVER php-$PHP_VERSION Magento-$MAGENTO_VERSION" echo "Built from: $GITHUB_REPO $GITHUB_BRANCH" echo "" echo "Magento: $MAGENTO_URL/admin" +echo " $MAGENTO_SECURE_URL/admin" +echo "POS: $MAGENTO_URL/pub/apps/pos/" +echo " $MAGENTO_SECURE_URL/pub/apps/pos/" echo "Admin: admin/admin123" echo "PHPMyAdmin: $PHPMYADMIN_URL" -echo "EMAIL: $EMAIL_URL" +echo "MAIL BOX: $EMAIL_URL" echo "" +# Slack hook +INFO="\n" +INFO="${INFO}Server Info: $HTTP_SERVER php-$PHP_VERSION Magento-$MAGENTO_VERSION \n" +INFO="${INFO}Built from: $GITHUB_REPO $GITHUB_BRANCH \n" +INFO="${INFO}\n" +INFO="${INFO}Magento: $MAGENTO_URL/admin \n" +INFO="${INFO} $MAGENTO_SECURE_URL/admin \n" +INFO="${INFO}POS: $MAGENTO_URL/pub/apps/pos/ \n" +INFO="${INFO} $MAGENTO_SECURE_URL/pub/apps/pos/ \n" +INFO="${INFO}Admin: admin/admin123 \n" +INFO="${INFO}PHPMyAdmin: $PHPMYADMIN_URL \n" +INFO="${INFO}MAIL BOX: $EMAIL_URL \n" +INFO="${INFO}" + +curl -X POST -s --data-urlencode "payload={\"text\": \"[RUNNING] <$RUN_DISPLAY_URL|$BUILD_DISPLAY_NAME> $INFO \"}" $SLACK_HOOKS_POS4 + # Living time set -x sleep $TIME_TO_LIVE From 14e27932ba0df823b5d43ab230507aebaecb61a4 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 28 Jan 2019 17:12:05 +0700 Subject: [PATCH 44/49] Add default variable --- bin/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/run.sh b/bin/run.sh index 0b8922f..c77bf58 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -51,7 +51,7 @@ INFO="${INFO}PHPMyAdmin: $PHPMYADMIN_URL \n" INFO="${INFO}MAIL BOX: $EMAIL_URL \n" INFO="${INFO}" -curl -X POST -s --data-urlencode "payload={\"text\": \"[RUNNING] <$RUN_DISPLAY_URL|$BUILD_DISPLAY_NAME> $INFO \"}" $SLACK_HOOKS_POS4 +curl -X POST -s --data-urlencode "payload={\"text\": \"[RUNNING] <$RUN_DISPLAY_URL|$BUILD_DISPLAY_NAME> $INFO \"}" ${SLACK_HOOKS_POS4:-localhost} # Living time set -x From d59b2f9a65ae9bbaff57cc92a615b9b272bdb7a2 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 28 Jan 2019 17:33:35 +0700 Subject: [PATCH 45/49] Fix https url --- bin/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/run.sh b/bin/run.sh index c77bf58..76a9d28 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -15,7 +15,7 @@ if [[ -z "$PORT" ]]; then fi MAGENTO_URL="http://$NODE_IP:$PORT" -MAGENTO_SECURE_URL="http://$NODE_IP:$PORT" +MAGENTO_SECURE_URL="https://$NODE_IP:$PORT" PORT=`docker-compose port --protocol=tcp phpmyadmin 80 | sed 's/0.0.0.0://'` PHPMYADMIN_URL="http://$NODE_IP:$PORT" From d8c70be975dd2a41a6a5d0ba3fcbb7ce3543bb9e Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 29 Jan 2019 09:51:57 +0700 Subject: [PATCH 46/49] Fix port secure 443 --- bin/run.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/bin/run.sh b/bin/run.sh index 76a9d28..2cf1e22 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -13,9 +13,13 @@ if [[ -z "$PORT" ]]; then echo "Server is not running..." exit 1 fi +PORTS=`docker-compose port --protocol=tcp magento 443 | sed 's/0.0.0.0://'` +if [[ -z "$PORTS" ]]; then + echo "Port 443 is not open or server is not running..." +fi MAGENTO_URL="http://$NODE_IP:$PORT" -MAGENTO_SECURE_URL="https://$NODE_IP:$PORT" +MAGENTO_SECURE_URL="https://$NODE_IP:$PORTS" PORT=`docker-compose port --protocol=tcp phpmyadmin 80 | sed 's/0.0.0.0://'` PHPMYADMIN_URL="http://$NODE_IP:$PORT" @@ -29,9 +33,9 @@ echo "Server Info: $HTTP_SERVER php-$PHP_VERSION Magento-$MAGENTO_VERSION" echo "Built from: $GITHUB_REPO $GITHUB_BRANCH" echo "" echo "Magento: $MAGENTO_URL/admin" -echo " $MAGENTO_SECURE_URL/admin" +[ -z "$PORTS" ] || echo " $MAGENTO_SECURE_URL/admin" echo "POS: $MAGENTO_URL/pub/apps/pos/" -echo " $MAGENTO_SECURE_URL/pub/apps/pos/" +[ -z "$PORTS" ] || echo " $MAGENTO_SECURE_URL/pub/apps/pos/" echo "Admin: admin/admin123" echo "PHPMyAdmin: $PHPMYADMIN_URL" echo "MAIL BOX: $EMAIL_URL" @@ -43,9 +47,9 @@ INFO="${INFO}Server Info: $HTTP_SERVER php-$PHP_VERSION Magento-$MAGENTO_VERSION INFO="${INFO}Built from: $GITHUB_REPO $GITHUB_BRANCH \n" INFO="${INFO}\n" INFO="${INFO}Magento: $MAGENTO_URL/admin \n" -INFO="${INFO} $MAGENTO_SECURE_URL/admin \n" +[ -z "$PORTS" ] || INFO="${INFO} $MAGENTO_SECURE_URL/admin \n" INFO="${INFO}POS: $MAGENTO_URL/pub/apps/pos/ \n" -INFO="${INFO} $MAGENTO_SECURE_URL/pub/apps/pos/ \n" +[ -z "$PORTS" ] || INFO="${INFO} $MAGENTO_SECURE_URL/pub/apps/pos/ \n" INFO="${INFO}Admin: admin/admin123 \n" INFO="${INFO}PHPMyAdmin: $PHPMYADMIN_URL \n" INFO="${INFO}MAIL BOX: $EMAIL_URL \n" From 54ba7fa25a8867f2a105433dc194f6ef5c31ed4e Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 31 Jan 2019 15:01:37 +0700 Subject: [PATCH 47/49] Add indexer reindex command --- bin/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/build.sh b/bin/build.sh index 98c7537..b14c914 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -138,6 +138,7 @@ docker-compose exec -u www-data -T magento bash -c \ docker-compose exec -u www-data -T magento bash -c "php bin/magento setup:upgrade" docker-compose exec -u www-data -T magento bash -c "php bin/magento webpos:deploy" +docker-compose exec -u www-data -T magento bash -c "php bin/magento indexer:reindex" # Update config for testing MAGENTO_CMD='php bin/magento config:set cms/wysiwyg/enabled disabled ; \ From 1157edc3bd2a34df04b0461d1c661e8ed1d382b5 Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 31 Jan 2019 16:06:34 +0700 Subject: [PATCH 48/49] Add clear magento cache --- bin/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/build.sh b/bin/build.sh index b14c914..8d3db53 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -145,3 +145,6 @@ MAGENTO_CMD='php bin/magento config:set cms/wysiwyg/enabled disabled ; \ php bin/magento config:set admin/security/admin_account_sharing 1 ; \ php bin/magento config:set admin/captcha/enable 0 ' docker-compose exec -u www-data -T magento bash -c "$MAGENTO_CMD" + +# clear magento cache +docker-compose exec -u www-data -T magento bash -c "php bin/magento cache:clean" From bb6f16e67871cd630c9dced3647e2bc6d806e246 Mon Sep 17 00:00:00 2001 From: Edward Nguyen Date: Fri, 15 Feb 2019 08:25:01 +0700 Subject: [PATCH 49/49] Update build.sh --- bin/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index 8d3db53..8452ca5 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -139,7 +139,7 @@ docker-compose exec -u www-data -T magento bash -c \ docker-compose exec -u www-data -T magento bash -c "php bin/magento setup:upgrade" docker-compose exec -u www-data -T magento bash -c "php bin/magento webpos:deploy" docker-compose exec -u www-data -T magento bash -c "php bin/magento indexer:reindex" - +docker-compose exec -u www-data -T magento bash -c "composer require zendframework/zend-barcode" # Update config for testing MAGENTO_CMD='php bin/magento config:set cms/wysiwyg/enabled disabled ; \ php bin/magento config:set admin/security/admin_account_sharing 1 ; \