@scandipwa/magento-scripts 2.4.3-alpha.0 → 2.4.4
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/lib/tasks/execute.js
CHANGED
|
@@ -12,6 +12,7 @@ const {
|
|
|
12
12
|
const { containerApi } = require('./docker/containers')
|
|
13
13
|
const dockerNetwork = require('./docker/network')
|
|
14
14
|
const KnownError = require('../errors/known-error')
|
|
15
|
+
const { prepareFileSystem } = require('./file-system')
|
|
15
16
|
|
|
16
17
|
/**
|
|
17
18
|
*
|
|
@@ -26,7 +27,8 @@ const executeTask = async (argv) => {
|
|
|
26
27
|
checkConfigurationFile(),
|
|
27
28
|
getProjectConfiguration(),
|
|
28
29
|
getCachedPorts(),
|
|
29
|
-
dockerNetwork.tasks.createNetwork()
|
|
30
|
+
dockerNetwork.tasks.createNetwork(),
|
|
31
|
+
prepareFileSystem()
|
|
30
32
|
],
|
|
31
33
|
{
|
|
32
34
|
concurrent: false,
|
|
@@ -19,10 +19,7 @@ const createSSLTerminatorConfig = () => ({
|
|
|
19
19
|
isDockerDesktop
|
|
20
20
|
} = ctx
|
|
21
21
|
|
|
22
|
-
const {
|
|
23
|
-
configuration: { sslTerminator },
|
|
24
|
-
ssl
|
|
25
|
-
} = overridenConfiguration
|
|
22
|
+
const { ssl } = overridenConfiguration
|
|
26
23
|
|
|
27
24
|
if (ssl.enabled && !ssl.external_provider) {
|
|
28
25
|
if (!ssl.ssl_certificate) {
|
|
@@ -91,6 +88,8 @@ const createSSLTerminatorConfig = () => ({
|
|
|
91
88
|
}
|
|
92
89
|
const hostPort = !isDockerDesktop ? ports.sslTerminator : 80
|
|
93
90
|
|
|
91
|
+
const { sslTerminator } = docker.getContainers(ports)
|
|
92
|
+
|
|
94
93
|
const nginxVersionOutput = await run({
|
|
95
94
|
image: sslTerminator.image,
|
|
96
95
|
command: 'nginx -v',
|
|
@@ -122,7 +121,9 @@ const createSSLTerminatorConfig = () => ({
|
|
|
122
121
|
'conf.d',
|
|
123
122
|
'default.conf'
|
|
124
123
|
),
|
|
125
|
-
template:
|
|
124
|
+
template:
|
|
125
|
+
overridenConfiguration.configuration.sslTerminator
|
|
126
|
+
.configTemplate,
|
|
126
127
|
overwrite: true,
|
|
127
128
|
templateArgs: {
|
|
128
129
|
ports,
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"description": "Scripts and configuration used by CMA.",
|
|
4
4
|
"homepage": "https://docs.create-magento-app.com/",
|
|
5
5
|
"repository": "github:scandipwa/create-magento-app",
|
|
6
|
-
"version": "2.4.
|
|
6
|
+
"version": "2.4.4",
|
|
7
7
|
"main": "./index.js",
|
|
8
8
|
"types": "./typings/index.d.ts",
|
|
9
9
|
"license": "OSL-3.0",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"@types/node": "^20.14.11",
|
|
60
60
|
"@types/yargs": "^17.0.32"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "402e8489c3ac99d30524da475da1931048a399b0"
|
|
63
63
|
}
|