@govuk-pay/cli 0.0.54 → 0.0.55
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/package.json
CHANGED
|
@@ -144,11 +144,13 @@ selfservice:
|
|
|
144
144
|
type: node
|
|
145
145
|
proxy: true
|
|
146
146
|
naxsi: true
|
|
147
|
+
is_bundled: true
|
|
147
148
|
db: false
|
|
148
149
|
port: 9400
|
|
149
150
|
debug_port: 9401
|
|
150
151
|
healthcheck: true
|
|
151
152
|
proxy_port: 39000
|
|
153
|
+
entrypoint_override_local: 'sh -c "npm ci && npm run dev"'
|
|
152
154
|
clusters:
|
|
153
155
|
- admin
|
|
154
156
|
- endtoend
|
|
@@ -138,7 +138,11 @@ services:
|
|
|
138
138
|
test: ["CMD", "wget", "-Y", "off", "-O", "/dev/null", "http://{{name}}:{{port}}/healthcheck"]
|
|
139
139
|
interval: 10s
|
|
140
140
|
timeout: 5s
|
|
141
|
+
{{#ifBoth isBundled localBuild}}
|
|
142
|
+
retries: 20
|
|
143
|
+
{{else}}
|
|
141
144
|
retries: 12
|
|
145
|
+
{{/ifBoth}}
|
|
142
146
|
env_file:
|
|
143
147
|
- {{../defaultServiceConfigsPath}}/services/{{name}}.env
|
|
144
148
|
{{#ifFileExists environmentOverrideFilePath}}
|
|
@@ -147,9 +151,12 @@ services:
|
|
|
147
151
|
{{#ifBoth ../mountLocalNodeApps localBuild}}
|
|
148
152
|
volumes:
|
|
149
153
|
- "$WORKSPACE/pay-{{../name}}:/app"
|
|
150
|
-
|
|
154
|
+
{{#if ../isBundled}}
|
|
155
|
+
- {{../name}}_node_modules:/app/node_modules
|
|
156
|
+
{{/if}}
|
|
157
|
+
{{#if ../../mountPayJSCommons}}
|
|
151
158
|
- "$WORKSPACE/pay-js-commons:/pay-js-commons"
|
|
152
|
-
|
|
159
|
+
{{/if}}
|
|
153
160
|
{{/ifBoth}}
|
|
154
161
|
environment:
|
|
155
162
|
- BIND_HOST=0.0.0.0
|
|
@@ -281,5 +288,10 @@ networks:
|
|
|
281
288
|
|
|
282
289
|
volumes:
|
|
283
290
|
{{#each dbServices}}
|
|
284
|
-
|
|
291
|
+
{{name}}:
|
|
292
|
+
{{/each}}
|
|
293
|
+
{{#each nodeApps}}
|
|
294
|
+
{{#if isBundled}}
|
|
295
|
+
{{name}}_node_modules:
|
|
296
|
+
{{/if}}
|
|
285
297
|
{{/each}}
|
|
@@ -180,7 +180,8 @@ function payServiceFromPayServiceConfig(config, upOptions, environmentOverridesP
|
|
|
180
180
|
imageTag: localBuild ? 'local' : 'latest-master',
|
|
181
181
|
requiresLocalStack: sqsQueues.length > 0 || snsTopics.length > 0,
|
|
182
182
|
entrypointOverrideLocal: config.entrypoint_override_local,
|
|
183
|
-
environmentOverrideFilePath: node_path_1.default.join(environmentOverridesPath, `${config.name}.env`)
|
|
183
|
+
environmentOverrideFilePath: node_path_1.default.join(environmentOverridesPath, `${config.name}.env`),
|
|
184
|
+
isBundled: config.is_bundled
|
|
184
185
|
};
|
|
185
186
|
}
|
|
186
187
|
function dbServiceFromPayServiceConfig(config) {
|