Skip to content
This repository was archived by the owner on Jan 25, 2022. It is now read-only.

Commit 03d81a4

Browse files
committed
Support for legacy project.json
1 parent d5ae06a commit 03d81a4

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

commands/readJSON

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,28 @@ then
5656
kvstore="$(jq -r '.services.kvstore' ${WPLIB_BOX_DIR}/project.json)"
5757
fi
5858

59+
60+
# Backwards compatibility.
5961
case $database in
6062
'mysql'|'')
6163
database=$d_database
6264
;;
65+
66+
*-*)
67+
IFS='-' read -r -a state_array <<< "$database"
68+
database="${DEFAULT_PROJECT}/${state_array[0]}:${state_array[1]}"
69+
;;
6370
esac
6471

6572
case $webserver in
6673
'nginx'|'')
6774
webserver=$d_webserver
6875
;;
76+
77+
*-*)
78+
IFS='-' read -r -a state_array <<< "$webserver"
79+
webserver="${DEFAULT_PROJECT}/${state_array[0]}:${state_array[1]}"
80+
;;
6981
esac
7082

7183
case $processvm in
@@ -74,14 +86,24 @@ case $processvm in
7486
;;
7587

7688
'php5*')
77-
processvm="wplib/php-fpm:5.6"
89+
processvm="${DEFAULT_PROJECT}/php-fpm:5.6"
90+
;;
91+
92+
php-fpm-*)
93+
IFS='-' read -r -a state_array <<< "$processvm"
94+
processvm="${DEFAULT_PROJECT}/${state_array[0]}-${state_array[1]}:${state_array[2]}"
7895
;;
7996
esac
8097

8198
case $kvstore in
8299
'redis'|'')
83100
kvstore=$d_kvstore
84101
;;
102+
103+
redis-*)
104+
IFS='-' read -r -a state_array <<< "$kvstore"
105+
kvstore="${DEFAULT_PROJECT}/${state_array[0]}:${state_array[1]}"
106+
;;
85107
esac
86108

87109
case $mail in

etc/releases/0.16.0-rc.2/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"database": "wplib/mysql:5.5.59",
55
"webserver": "wplib/nginx:1.13.9",
6-
"processvm": "wplib/php-fpm:7.1.15",
6+
"processvm": "wplib/php-fpm:7.1.16",
77
"kvstore": "wplib/redis:4.0.8",
88
"mail": "wplib/mailhog:1.0.0",
99
"proxy": "wplib/proxy:1.13.9",

0 commit comments

Comments
 (0)