@fishawack/lab-env 4.32.0 → 4.33.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/commands/create/cmds/diagnose.js +18 -12
- package/core/0/docker-compose.yml +4 -4
- package/core/1/docker-compose.yml +3 -3
- package/globals.js +1 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
## Changelog
|
|
2
2
|
|
|
3
|
+
### 4.33.0 (2024-07-15)
|
|
4
|
+
* [Feature] can now specify the root fw directory
|
|
5
|
+
|
|
6
|
+
### 4.32.1 (2024-07-15)
|
|
7
|
+
* [Bug] added more ci skip steps to dianose command
|
|
8
|
+
|
|
3
9
|
### 4.32.0 (2024-07-12)
|
|
4
10
|
* [Feature] added ci flag to skip creating ssh keys
|
|
5
11
|
|
|
@@ -83,9 +83,11 @@ module.exports = [
|
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
85
|
|
|
86
|
-
|
|
87
|
-
await
|
|
88
|
-
|
|
86
|
+
if(!argv.ci){
|
|
87
|
+
while(!await test.egnyte() || !await egnyte.check()){
|
|
88
|
+
await guide.egnyte(argv);
|
|
89
|
+
};
|
|
90
|
+
}
|
|
89
91
|
|
|
90
92
|
if(argv.legacy){
|
|
91
93
|
while(!await test.watertight()){
|
|
@@ -99,8 +101,10 @@ module.exports = [
|
|
|
99
101
|
await guide.misc(argv);
|
|
100
102
|
};
|
|
101
103
|
|
|
102
|
-
|
|
103
|
-
await
|
|
104
|
+
if(!argv.ci){
|
|
105
|
+
while(!await test.bitbucket() || !await bitbucket.check()){
|
|
106
|
+
await guide.bitbucket(argv);
|
|
107
|
+
}
|
|
104
108
|
}
|
|
105
109
|
|
|
106
110
|
if(argv.legacy){
|
|
@@ -111,14 +115,16 @@ module.exports = [
|
|
|
111
115
|
}
|
|
112
116
|
}
|
|
113
117
|
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
await bitbucket.
|
|
118
|
+
if(!argv.ci){
|
|
119
|
+
const userRepoName = vars.misc.bitbucket.username.split('@')[0].replace(/\./, '-');
|
|
120
|
+
|
|
121
|
+
// Check ability to create and delete Bitbucket repos
|
|
122
|
+
if(!await bitbucket.exists(userRepoName)){
|
|
123
|
+
await bitbucket.fork(userRepoName, {name: 'boilerplate'});
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
await bitbucket.remove(userRepoName);
|
|
119
127
|
}
|
|
120
|
-
|
|
121
|
-
await bitbucket.remove(userRepoName);
|
|
122
128
|
}
|
|
123
129
|
|
|
124
130
|
// Update diagnosis version in ~/.lab-env config file
|
|
@@ -8,10 +8,10 @@ services:
|
|
|
8
8
|
tty: true
|
|
9
9
|
volumes:
|
|
10
10
|
- $CWD/:/app
|
|
11
|
-
- $
|
|
12
|
-
- $
|
|
13
|
-
- $
|
|
14
|
-
- $
|
|
11
|
+
- $FW_DIR/.gitconfig:/root/.gitconfig
|
|
12
|
+
- $FW_DIR/targets:/root/targets
|
|
13
|
+
- $FW_DIR/.ssh:/root/.ssh
|
|
14
|
+
- $FW_DIR/.aws:/root/.aws
|
|
15
15
|
- node_modules:/app/node_modules
|
|
16
16
|
ports:
|
|
17
17
|
- ${PORT:-3000}:${PORT:-3000}
|
|
@@ -13,9 +13,9 @@ services:
|
|
|
13
13
|
tty: true
|
|
14
14
|
volumes:
|
|
15
15
|
- $CWD/:/app
|
|
16
|
-
- $
|
|
17
|
-
- $
|
|
18
|
-
- $
|
|
16
|
+
- $FW_DIR/targets:/home/node/targets
|
|
17
|
+
- $FW_DIR/.ssh:/home/node/.ssh
|
|
18
|
+
- $FW_DIR/.aws:/home/node/.aws
|
|
19
19
|
- node_modules:/app/node_modules
|
|
20
20
|
ports:
|
|
21
21
|
- ${PORT:-3000}:${PORT:-3000}
|
package/globals.js
CHANGED
|
@@ -11,6 +11,7 @@ const args = hideBin(process.argv);
|
|
|
11
11
|
process.env.DIRNAME = __dirname;
|
|
12
12
|
process.env.USER_UID=execSync("id -u", {encoding: 'utf8', stdio: 'pipe'}).trim();
|
|
13
13
|
process.env.USER_GID=execSync("id -g", {encoding: 'utf8', stdio: 'pipe'}).trim();
|
|
14
|
+
process.env.FW_DIR = process.env.FW_DIR || process.env.HOME;
|
|
14
15
|
|
|
15
16
|
const cwd = process.cwd();
|
|
16
17
|
|