Skip to content

Commit 71a9772

Browse files
author
Doug Hatcher
committed
makefile improvements, php memroy limits in passthru
1 parent 53d083c commit 71a9772

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ help:
1616
build: ## creates binary
1717
go build ${LDFLAGS} .
1818
install: build ## compiles and installs into system
19-
sudo cp magento-cli /usr/local/bin/magento
20-
sudo chmod +x /usr/local/bin/magento
19+
rm ~/.magento-cloud/bin/magento
20+
cp ./magento-cli ~/.magento-cloud/bin/magento
21+
sudo chmod +x ~/.magento-cloud/bin/magento
2122
run: ## run the command through go, accepts args i.e. `make run -- build -h`
2223
go run ${LDFLAGS} ./main.go $(RUN_ARGS)
2324
test: build

tasks/_global.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ definitions:
2828
description: routes used for local development server
2929
default: $(pwd)/pub/ $(pwd)/phpserver/router.php
3030

31-
- name: php-bin-cmd
31+
- name: php-cmd
3232
type: string
3333
description: default command to use to trigger local php server
34-
default: php -d memory_limit=-1 -d max_input_time=3600 -d max_input_vars=10000 -S
34+
default: php -d memory_limit=-1 -d max_input_time=3600 -d max_input_vars=10000
3535

3636
- name: php-bin-path
3737
type: string

tasks/passthru.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/usr/bin/env variant
22
interactive: true
3+
parameters: *global
34
script: |
45
CMD=$(echo {{ index .args }} | sed -r 's/(\[|\])//g')
5-
$MAGECLI_PHP_CMD bin/magento $CMD
6+
echo {{ get "php-bin-cmd" }} bin/magento $CMD

tasks/serve.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ tasks:
33
serve:
44
parameters: *global
55
script: |
6-
COMMAND="{{ get "php-bin-cmd" }} {{ get "host" }}:{{ get "port" }} -t {{ get "routes" }}"
6+
COMMAND="{{ get "php-bin-cmd" }} -S {{ get "host" }}:{{ get "port" }} -t {{ get "routes" }}"
77
echo $COMMAND
88
$COMMAND

0 commit comments

Comments
 (0)