@abgov/nx-oc 3.1.0 → 3.2.0-beta.1
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 +5 -4
- package/src/executors/apply/apply.js +1 -1
- package/src/generators/apply-infra/apply-infra.js +1 -1
- package/src/generators/deployment/deployment.js +1 -1
- package/src/generators/deployment/dotnet-files/Dockerfile.template +2 -2
- package/src/generators/deployment/express-files/Dockerfile.template +1 -1
- package/src/generators/pipeline/pipeline.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abgov/nx-oc",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.2.0-beta.1",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"description": "Government of Alberta - DIO - Nx plugin for OpenShift.",
|
|
@@ -12,9 +12,10 @@
|
|
|
12
12
|
"generators": "./generators.json",
|
|
13
13
|
"executors": "./executors.json",
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"yaml": "^1.10.2"
|
|
16
|
-
"@nrwl/devkit": "13.8.1"
|
|
15
|
+
"yaml": "^1.10.2"
|
|
17
16
|
},
|
|
18
17
|
"typings": "./src/index.d.ts",
|
|
19
|
-
"peerDependencies": {
|
|
18
|
+
"peerDependencies": {
|
|
19
|
+
"@nrwl/devkit": "13.10.5"
|
|
20
|
+
}
|
|
20
21
|
}
|
|
@@ -18,7 +18,7 @@ function normalizeSchema(options) {
|
|
|
18
18
|
return { ocProjects };
|
|
19
19
|
}
|
|
20
20
|
function runExecutor(options, { projectName }) {
|
|
21
|
-
return
|
|
21
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
22
|
console.log(`Running oc apply for ${projectName}...`);
|
|
23
23
|
const { ocProjects } = normalizeSchema(options);
|
|
24
24
|
const failed = ocProjects
|
|
@@ -12,7 +12,7 @@ function applyOcResources(host) {
|
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
function default_1(host) {
|
|
15
|
-
return
|
|
15
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
16
|
const { success } = (0, oc_utils_1.runOcCommand)('project', []);
|
|
17
17
|
if (success) {
|
|
18
18
|
applyOcResources(host);
|
|
@@ -45,7 +45,7 @@ function addFiles(host, options) {
|
|
|
45
45
|
(0, devkit_1.generateFiles)(host, path.join(__dirname, `${options.appType}-files`), `${path.dirname((0, devkit_1.getWorkspacePath)(host))}/.openshift/${options.projectName}`, templateOptions);
|
|
46
46
|
}
|
|
47
47
|
function default_1(host, options) {
|
|
48
|
-
return
|
|
48
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
49
49
|
const config = (0, devkit_1.readProjectConfiguration)(host, options.project);
|
|
50
50
|
if (config.projectType !== 'application') {
|
|
51
51
|
console.log('Cannot generate deployment for library.');
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
# This is a minimal Dockerfile for app deployment.
|
|
2
|
-
FROM registry.access.redhat.com/ubi8/dotnet-
|
|
2
|
+
FROM registry.access.redhat.com/ubi8/dotnet-60-runtime
|
|
3
3
|
|
|
4
4
|
ARG PROJECT
|
|
5
5
|
ARG ASSEMBLY
|
|
6
6
|
|
|
7
|
-
COPY ./dist/apps/${PROJECT}/Release/
|
|
7
|
+
COPY ./dist/apps/${PROJECT}/Release/net6.0 .
|
|
8
8
|
|
|
9
9
|
ENV ASSEMBLY ${ASSEMBLY}
|
|
10
10
|
CMD dotnet ${ASSEMBLY}
|
|
@@ -27,7 +27,7 @@ function addFiles(host, options) {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
function default_1(host, options) {
|
|
30
|
-
return
|
|
30
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
31
31
|
const normalizedOptions = normalizeOptions(host, options);
|
|
32
32
|
addFiles(host, normalizedOptions);
|
|
33
33
|
yield (0, devkit_1.formatFiles)(host);
|