Skip to content

Commit 712ae78

Browse files
author
Rafael Grigorian
committed
Fixed #56 
1 parent efaaead commit 712ae78

File tree

6 files changed

+33
-12
lines changed

6 files changed

+33
-12
lines changed

‎docker-compose.yml‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ networks:
1212
- subnet: "192.168.7.0/28"
1313
services:
1414
php-fpm:
15-
image: jetrails/magento-alpine:php-fpm-7.1
15+
image: jetrails/magento-alpine:php-fpm-7.4
1616
restart: unless-stopped
1717
volumes:
1818
- app-sync:/var/www/html:rw
@@ -22,20 +22,23 @@ services:
2222
- php-fpm.docker.internal
2323
environment:
2424
- VERBOSE=true
25+
- COMPOSER_MEMORY_LIMIT=-1
2526
links:
2627
- mysql
2728
php-cli:
28-
image: jetrails/magento-alpine:php-cli-7.1
29+
image: jetrails/magento-alpine:php-cli-7.4
2930
volumes:
3031
- app-sync:/var/www/html:rw
3132
networks:
3233
default:
3334
aliases:
3435
- php-cli.docker.internal
36+
environment:
37+
- COMPOSER_MEMORY_LIMIT=-1
3538
links:
3639
- mysql
3740
php-cron:
38-
image: jetrails/magento-alpine:php-cron-7.1
41+
image: jetrails/magento-alpine:php-cron-7.4
3942
restart: unless-stopped
4043
volumes:
4144
- app-sync:/var/www/html:rw
@@ -45,6 +48,7 @@ services:
4548
- php-cron.docker.internal
4649
environment:
4750
- VERBOSE=false
51+
- COMPOSER_MEMORY_LIMIT=-1
4852
links:
4953
- mysql
5054
nginx:
@@ -58,12 +62,13 @@ services:
5862
- nginx.docker.internal
5963
environment:
6064
- VERBOSE=true
65+
- MAGENTO_VERSION=2
6166
links:
6267
- php-fpm
6368
ports:
6469
- "443:443"
6570
mysql:
66-
image: jetrails/magento-alpine:mysql
71+
image: jetrails/magento-alpine:mysql-8
6772
restart: unless-stopped
6873
volumes:
6974
- database:/var/lib/mysql
@@ -79,7 +84,7 @@ services:
7984
- MYSQL_USER_PASSWORD=magento
8085
- MYSQL_DATABASE=magento
8186
varnish:
82-
image: jetrails/magento-alpine:varnish
87+
image: jetrails/magento-alpine:varnish-6
8388
restart: unless-stopped
8489
environment:
8590
- VERBOSE=false
@@ -91,3 +96,19 @@ services:
9196
- nginx
9297
ports:
9398
- "80:80"
99+
elasticsearch:
100+
image: docker.elastic.co/elasticsearch/elasticsearch:7.9.0
101+
restart: unless-stopped
102+
ports:
103+
- "9200:9200"
104+
- "9300:9300"
105+
environment:
106+
- bootstrap.memory_lock=true
107+
- discovery.type=single-node
108+
- "ES_JAVA_OPTS=-Xms2g -Xmx2g"
109+
- cluster.routing.allocation.disk.threshold_enabled=false
110+
ulimits:
111+
memlock:
112+
soft: -1
113+
hard: -1
114+
user: "elasticsearch"

‎src/app/code/JetRails/Cloudflare/view/adminhtml/web/js/bundle.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13782,7 +13782,7 @@ $(window).on ( "load", function () {
1378213782
"action": $(this).data ("target")
1378313783
},
1378413784
"form": {
13785-
"endpoint": $(this).closest ("section").data ("endpoint").replace ( /(cloudflare\/[^\/]+\/)(index)(.*)$/, "$1" + $(this).data ("target") + "$3" ),
13785+
"endpoint": $(this).closest ("section").data ("endpoint").replace ( /(cloudflare\/[^\/]+\/)(index)?(.*)$/, "$1" + $(this).data ("target") + "$3" ),
1378613786
"key": $(this).closest ("section").data ("form-key")
1378713787
},
1378813788
"section": section,
@@ -15604,7 +15604,7 @@ $(document).on ( "change", ".editable, .proxied, td.ttl", ( event ) => {
1560415604
$(entry).find (".proxied").prop ("src").indexOf ("proxied_on") >= 0
1560515605
let priority = $(entry).find (".value .priority").text () || 0
1560615606
let section = $(entry).closest ("section")
15607-
let endpoint = $(section).data ("endpoint").replace ( /(cloudflare\/[^\/]+\/)(index)(.*)$/, "$1edit$3" )
15607+
let endpoint = $(section).data ("endpoint").replace ( /(cloudflare\/[^\/]+\/)(index)?(.*)$/, "$1edit$3" )
1560815608
let formKey = $(section).data ("form-key")
1560915609
$(section).addClass ("loading")
1561015610
$(section).find ("[contenteditable]").prop ( "contenteditable", false )
@@ -17472,7 +17472,7 @@ __WEBPACK_IMPORTED_MODULE_0_jquery___default()(document).on ( "cloudflare.page_r
1747217472
}
1747317473
})
1747417474
__WEBPACK_IMPORTED_MODULE_0_jquery___default.a.ajax ({
17475-
url: __WEBPACK_IMPORTED_MODULE_0_jquery___default()(data.section).data ("endpoint").replace ( /(cloudflare\/[^\/]+\/)(index)(.*)$/, "$1priority$3" ),
17475+
url: __WEBPACK_IMPORTED_MODULE_0_jquery___default()(data.section).data ("endpoint").replace ( /(cloudflare\/[^\/]+\/)(index)?(.*)$/, "$1priority$3" ),
1747617476
type: "POST",
1747717477
data: {
1747817478
"form_key": __WEBPACK_IMPORTED_MODULE_0_jquery___default()(data.section).data ("form-key"),

‎src/app/code/JetRails/Cloudflare/view/adminhtml/web/js/bundle.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/app/code/JetRails/Cloudflare/view/adminhtml/web/js/dns/dns_records.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ $(document).on ( "change", ".editable, .proxied, td.ttl", ( event ) => {
659659
$(entry).find (".proxied").prop ("src").indexOf ("proxied_on") >= 0
660660
let priority = $(entry).find (".value .priority").text () || 0
661661
let section = $(entry).closest ("section")
662-
let endpoint = $(section).data ("endpoint").replace ( /(cloudflare\/[^\/]+\/)(index)(.*)$/, "$1edit$3" )
662+
let endpoint = $(section).data ("endpoint").replace ( /(cloudflare\/[^\/]+\/)(index)?(.*)$/, "$1edit$3" )
663663
let formKey = $(section).data ("form-key")
664664
$(section).addClass ("loading")
665665
$(section).find ("[contenteditable]").prop ( "contenteditable", false )

‎src/app/code/JetRails/Cloudflare/view/adminhtml/web/js/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ $(window).on ( "load", function () {
5959
"action": $(this).data ("target")
6060
},
6161
"form": {
62-
"endpoint": $(this).closest ("section").data ("endpoint").replace ( /(cloudflare\/[^\/]+\/)(index)(.*)$/, "$1" + $(this).data ("target") + "$3" ),
62+
"endpoint": $(this).closest ("section").data ("endpoint").replace ( /(cloudflare\/[^\/]+\/)(index)?(.*)$/, "$1" + $(this).data ("target") + "$3" ),
6363
"key": $(this).closest ("section").data ("form-key")
6464
},
6565
"section": section,

‎src/app/code/JetRails/Cloudflare/view/adminhtml/web/js/page_rules/page_rules.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ $(document).on ( "cloudflare.page_rules.page_rules.initialize", function ( event
405405
}
406406
})
407407
$.ajax ({
408-
url: $(data.section).data ("endpoint").replace ( /(cloudflare\/[^\/]+\/)(index)(.*)$/, "$1priority$3" ),
408+
url: $(data.section).data ("endpoint").replace ( /(cloudflare\/[^\/]+\/)(index)?(.*)$/, "$1priority$3" ),
409409
type: "POST",
410410
data: {
411411
"form_key": $(data.section).data ("form-key"),

0 commit comments

Comments
 (0)