Skip to content

Epankou/bug catalog item images cli #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Nov 21, 2018
Merged

Epankou/bug catalog item images cli #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5eda328
volume mapping & delete with clean up
Nov 8, 2018
f4b4540
volume mapping & delete with clean up
Nov 9, 2018
f4905f2
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 9, 2018
b0f0044
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 9, 2018
04d9e0d
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 9, 2018
bfcb07b
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 12, 2018
fe5ec89
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 12, 2018
2c71a29
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 12, 2018
cfec99d
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 12, 2018
189046b
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 12, 2018
3fa9b51
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 12, 2018
4a6b647
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 12, 2018
c935f42
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 12, 2018
f2b6d83
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 12, 2018
cc5908d
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 12, 2018
98affa1
connector non dev mode fix EWC-339
Nov 12, 2018
74f71e6
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 12, 2018
4bd5e17
Merge remote-tracking branch 'origin/develop' into epankou/bug-non-de…
Nov 12, 2018
b901f44
Merge branch 'develop' of https://github.com/ioFog/FogController into…
Nov 13, 2018
8dba24f
microservice removal cli bug fix
Nov 13, 2018
6d5d271
catalog item creation fix
Nov 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/cli/catalog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,8 @@ const _createCatalogItemObject = function (catalogItem) {
ramRequired: catalogItem.ramRequired,
picture: catalogItem.picture,
isPublic: AppHelper.validateBooleanCliOptions(catalogItem.public, catalogItem.private),
registryId: catalogItem.registryId
};

if (catalogItem.images) {
catalogItemObj.images = [
registryId: catalogItem.registryId,
images: [
{
containerImage: catalogItem.x86Image,
fogTypeId: 1
Expand All @@ -271,8 +268,8 @@ const _createCatalogItemObject = function (catalogItem) {
containerImage: catalogItem.armImage,
fogTypeId: 2
}
];
}
]
};

if (catalogItem.inputType) {
catalogItemObj.inputType = {
Expand Down
4 changes: 2 additions & 2 deletions src/services/microservices-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,11 @@ const _deleteMicroservice = async function (microserviceUuid, microserviceData,
?
{
uuid: microserviceUuid,
userId: user.id
}
:
{
uuid: microserviceUuid
uuid: microserviceUuid,
userId: user.id
};


Expand Down