packaging: build and bundle UI using npm in deb and rpm packages #4605
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| /etc/cloudstack/ui/config.json | ||
| /usr/share/cloudstack-ui/* |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -93,6 +93,20 @@ override_dh_auto_install: | |
| install -m0644 packaging/systemd/$(PACKAGE)-management.service debian/$(PACKAGE)-management/lib/systemd/system/$(PACKAGE)-management.service | ||
| install -m0644 packaging/systemd/$(PACKAGE)-management.default $(DESTDIR)/$(SYSCONFDIR)/default/$(PACKAGE)-management | ||
|
|
||
| # cloudstack-ui | ||
| mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/ui | ||
| mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-ui | ||
| cd ui && npm install && npm run build && cd .. | ||
|
Contributor
There was a problem hiding this comment. This assumes that npn is available on the system. However, that's not a guarantee. The .deb (and .rpm) should have a build depends on 'npm'
Member
Author
There was a problem hiding this comment. Yes that adds a dependency much like jdk or mvn. I've added nodejs-12 (lts) in the container images that are used to build packages by blueorangutan. https://hub.docker.com/u/bhaisaab
Member
Author
There was a problem hiding this comment. The problem is that nodejs may not be available in default/main repo of the distros. Should we document it on docs and install.md?
Member
There was a problem hiding this comment. @rhtyd this looks like a good point to be documented indeed
Contributor
There was a problem hiding this comment.
No, we should require it in the .spec and control file as a hard requirement. The build will fail without those, so it shouldn't even start to build. The control and .spec file should exactly specify what is needed to build the packages. Without those dependencies the build should not initiate
Member
Author
There was a problem hiding this comment. Added, but that won't be satisfied automatically chances are somebody will install older version of nodejs. |
||
| cp -r ui/dist/config.json $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/ui/ | ||
| cp -r ui/dist/* $(DESTDIR)/usr/share/$(PACKAGE)-ui/ | ||
| rm -f $(DESTDIR)/usr/share/$(PACKAGE)-ui/config.json | ||
| ln -s /$(SYSCONFDIR)/$(PACKAGE)/ui/config.json $(DESTDIR)/usr/share/$(PACKAGE)-ui/config.json | ||
| # copy ui to cloudstack-management | ||
| cp -r ui/dist/config.json $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/ | ||
| cp -r ui/dist/* $(DESTDIR)/usr/share/$(PACKAGE)-management/webapp/ | ||
| rm -f $(DESTDIR)/usr/share/$(PACKAGE)-management/webapp/config.json | ||
| ln -s /$(SYSCONFDIR)/$(PACKAGE)/management/config.json $(DESTDIR)/usr/share/$(PACKAGE)-management/webapp/config.json | ||
|
|
||
| # cloudstack-common | ||
| mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-common | ||
| mkdir $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we want users to be able to install just the cloudstack-ui package? If so, maybe we need to specify the actual dependencies needed for just running the UI.
Would that be cloudstack-common or is that not even needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, this is based on the feedback on the ML - people may just want the UI to be say hosted by nginx. One way was to ship archive, the other to just introduce a new pkg that installs it at a specific location (not in cloudstack-managment pkg, which gets UI by default for backward compatibility)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Depends: ${misc:Depends}That might generate a long list of dependencies for the cloudstack-ui package which aren't needed at all.
Therefor we might want to compile the list manually
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will fix it