-
Notifications
You must be signed in to change notification settings - Fork 215
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.
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
Fixes v10 JSS and SXA web.config transforms, examples on installing NodeJS in Integrated Mode #469
Merged
jeanfrancoislarente
merged 49 commits into
Sitecore:master
from
sitecore-design:release/sxa-jss-nodejs
Dec 15, 2020
Merged
Fixes v10 JSS and SXA web.config transforms, examples on installing NodeJS in Integrated Mode #469
jeanfrancoislarente
merged 49 commits into
Sitecore:master
from
sitecore-design:release/sxa-jss-nodejs
Dec 15, 2020
Conversation
This file contains 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
* Fxies issues 386 and 387 Signed-off-by: Vincent Lui <[email protected]> * rebase * rebase * Removed forced install of NodeJS in the standard built containers that are meant to be reused. * Created a DockerFile to install NodeJS as an example * Renamed DockerFile to b more descriptive for Integrated Mode use * Update compose override to use JSS 15, and add CD to make sure JSS SCWDP is installed into CD * Added build reference to the CM image for integrated mode * Moved the JSS Integrated Mode Dockerfile outside as it applies to all Sitecore SKUs * Initial copy of test files from xp1 * Removing XM1 compose files * Fixed up the dockerfile with NodeJS installation * Added NodeJS_VERSION to Environment file * Updated the compose-override file with nodejs build, correct CD and Solr containers * December Change Log * dsd
vtml
requested review from
bplasmeijer and
jeanfrancoislarente
as code owners
December 7, 2020 10:20
vtml
changed the title
Release/sxa jss nodejs
Fixes v10 JSS and SXA web.config transforms, examples on installing NodeJS in Integrated Mode
Dec 7, 2020
7 tasks
Please remove any changes you may have made to |
Done |
…oper json indentations
…oper json indentations Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
build/windows/tests/10.0.x/build/jss-integrated-mode/Dockerfile
Outdated
Show resolved
Hide resolved
Signed-off-by: Vincent Lui <[email protected]>
The compose override file should be pointing to the community namespace in the docker container registry Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
Release/sxa jss nodejs
Signed-off-by: Vincent Lui <[email protected]>
* Bug/sxa jss nodejs (#15) * Fxies issues 386 and 387 Signed-off-by: Vincent Lui <[email protected]> * rebase * rebase * Removed forced install of NodeJS in the standard built containers that are meant to be reused. * Created a DockerFile to install NodeJS as an example * Renamed DockerFile to b more descriptive for Integrated Mode use * Update compose override to use JSS 15, and add CD to make sure JSS SCWDP is installed into CD * Added build reference to the CM image for integrated mode * Moved the JSS Integrated Mode Dockerfile outside as it applies to all Sitecore SKUs * Initial copy of test files from xp1 * Removing XM1 compose files * Fixed up the dockerfile with NodeJS installation * Added NodeJS_VERSION to Environment file * Updated the compose-override file with nodejs build, correct CD and Solr containers * December Change Log * dsd * Duplicating jss assets 1501 build from 1500 build * Making changes to the 1501-build to reflect JSS 1501 * reset sitecore-tags.md * Removed JSS head references in 1500-build.json * Adding JSS 1501 to linux mssql xp0-build.json * Quickly fixing some code formatting issues for xp1-build.json with proper json indentations * Quickly fixing some code formatting issues for xp1-build.json with proper json indentations Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to linux mssql xp1-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to windows xm-build.json Signed-off-by: Vincent Lui <[email protected]> * Combining the layers The compose override file should be pointing to the community namespace in the docker container registry Signed-off-by: Vincent Lui <[email protected]> * Reverting back to using ${REGISTRY} instead Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
* Bug/sxa jss nodejs (#15) * Fxies issues 386 and 387 Signed-off-by: Vincent Lui <[email protected]> * rebase * rebase * Removed forced install of NodeJS in the standard built containers that are meant to be reused. * Created a DockerFile to install NodeJS as an example * Renamed DockerFile to b more descriptive for Integrated Mode use * Update compose override to use JSS 15, and add CD to make sure JSS SCWDP is installed into CD * Added build reference to the CM image for integrated mode * Moved the JSS Integrated Mode Dockerfile outside as it applies to all Sitecore SKUs * Initial copy of test files from xp1 * Removing XM1 compose files * Fixed up the dockerfile with NodeJS installation * Added NodeJS_VERSION to Environment file * Updated the compose-override file with nodejs build, correct CD and Solr containers * December Change Log * dsd * reset sitecore-tags.md * Combining the layers The compose override file should be pointing to the community namespace in the docker container registry Signed-off-by: Vincent Lui <[email protected]> * Reverting back to using ${REGISTRY} instead Signed-off-by: Vincent Lui <[email protected]> * Changes with community prefix, and removing OS image tag Signed-off-by: Vincent Lui <[email protected]> * Initial duplication for XM1 * Resetting compose files to original * Changing XM1 compose files to reflect correctly * All the changes for JSS XM1 witth NodeJS installed * Revert
Signed-off-by: Vincent Lui <[email protected]>
* Bug/sxa jss nodejs (#15) * Fxies issues 386 and 387 Signed-off-by: Vincent Lui <[email protected]> * rebase * rebase * Removed forced install of NodeJS in the standard built containers that are meant to be reused. * Created a DockerFile to install NodeJS as an example * Renamed DockerFile to b more descriptive for Integrated Mode use * Update compose override to use JSS 15, and add CD to make sure JSS SCWDP is installed into CD * Added build reference to the CM image for integrated mode * Moved the JSS Integrated Mode Dockerfile outside as it applies to all Sitecore SKUs * Initial copy of test files from xp1 * Removing XM1 compose files * Fixed up the dockerfile with NodeJS installation * Added NodeJS_VERSION to Environment file * Updated the compose-override file with nodejs build, correct CD and Solr containers * December Change Log * dsd * reset sitecore-tags.md * Combining the layers The compose override file should be pointing to the community namespace in the docker container registry Signed-off-by: Vincent Lui <[email protected]> * Reverting back to using ${REGISTRY} instead Signed-off-by: Vincent Lui <[email protected]> * Changes with community prefix, and removing OS image tag Signed-off-by: Vincent Lui <[email protected]> * Initial duplication for XM1 * Resetting compose files to original * Changing XM1 compose files to reflect correctly * All the changes for JSS XM1 witth NodeJS installed * Revert * Delete 1501-build.json * Unpollute JSS 15.0.1 Signed-off-by: Vincent Lui <[email protected]>
* Bug/sxa jss nodejs (#15) * Fxies issues 386 and 387 Signed-off-by: Vincent Lui <[email protected]> * rebase * rebase * Removed forced install of NodeJS in the standard built containers that are meant to be reused. * Created a DockerFile to install NodeJS as an example * Renamed DockerFile to b more descriptive for Integrated Mode use * Update compose override to use JSS 15, and add CD to make sure JSS SCWDP is installed into CD * Added build reference to the CM image for integrated mode * Moved the JSS Integrated Mode Dockerfile outside as it applies to all Sitecore SKUs * Initial copy of test files from xp1 * Removing XM1 compose files * Fixed up the dockerfile with NodeJS installation * Added NodeJS_VERSION to Environment file * Updated the compose-override file with nodejs build, correct CD and Solr containers * December Change Log * dsd * Duplicating jss assets 1501 build from 1500 build * Making changes to the 1501-build to reflect JSS 1501 * reset sitecore-tags.md * Removed JSS head references in 1500-build.json * Adding JSS 1501 to linux mssql xp0-build.json * Quickly fixing some code formatting issues for xp1-build.json with proper json indentations * Quickly fixing some code formatting issues for xp1-build.json with proper json indentations Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to linux mssql xp1-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to windows xm-build.json Signed-off-by: Vincent Lui <[email protected]> * Combining the layers The compose override file should be pointing to the community namespace in the docker container registry Signed-off-by: Vincent Lui <[email protected]> * Reverting back to using ${REGISTRY} instead Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to windows xp-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to windows xp0-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to mssql xm-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to mssql xp-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to mssql xm1-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to mssql xp1-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to mssql xp0-build.json Signed-off-by: Vincent Lui <[email protected]> * Forgot to add JSS 15.0.1 for XM with Publishing Service Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
* Bug/sxa jss nodejs (#15) * Fxies issues 386 and 387 Signed-off-by: Vincent Lui <[email protected]> * rebase * rebase * Removed forced install of NodeJS in the standard built containers that are meant to be reused. * Created a DockerFile to install NodeJS as an example * Renamed DockerFile to b more descriptive for Integrated Mode use * Update compose override to use JSS 15, and add CD to make sure JSS SCWDP is installed into CD * Added build reference to the CM image for integrated mode * Moved the JSS Integrated Mode Dockerfile outside as it applies to all Sitecore SKUs * Initial copy of test files from xp1 * Removing XM1 compose files * Fixed up the dockerfile with NodeJS installation * Added NodeJS_VERSION to Environment file * Updated the compose-override file with nodejs build, correct CD and Solr containers * December Change Log * dsd * Duplicating jss assets 1501 build from 1500 build * Making changes to the 1501-build to reflect JSS 1501 * reset sitecore-tags.md * Removed JSS head references in 1500-build.json * Adding JSS 1501 to linux mssql xp0-build.json * Quickly fixing some code formatting issues for xp1-build.json with proper json indentations * Quickly fixing some code formatting issues for xp1-build.json with proper json indentations Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to linux mssql xp1-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to windows xm-build.json Signed-off-by: Vincent Lui <[email protected]> * Combining the layers The compose override file should be pointing to the community namespace in the docker container registry Signed-off-by: Vincent Lui <[email protected]> * Reverting back to using ${REGISTRY} instead Signed-off-by: Vincent Lui <[email protected]> * Changes with community prefix, and removing OS image tag Signed-off-by: Vincent Lui <[email protected]> * Initial duplication for XM1 * Resetting compose files to original * Changing XM1 compose files to reflect correctly * All the changes for JSS XM1 witth NodeJS installed * Revert * Adding JSS 1501 to windows xp-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to windows xp0-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to mssql xm-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to mssql xp-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to mssql xm1-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to mssql xp1-build.json Signed-off-by: Vincent Lui <[email protected]> * Adding JSS 1501 to mssql xp0-build.json Signed-off-by: Vincent Lui <[email protected]> * Forgot to add JSS 15.0.1 for XM with Publishing Service Signed-off-by: Vincent Lui <[email protected]> * Delete 1501-build.json * Unpollute JSS 15.0.1 Signed-off-by: Vincent Lui <[email protected]> * Removing private registry * Removed all generated values in .env Signed-off-by: Vincent Lui <[email protected]> * Removed all generated values in .env Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
Signed-off-by: Vincent Lui <[email protected]>
Apologies with all the commits @jeanfrancoislarente, I was in some merge conflict hell with another branch. This PR is now ready to review. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Pull Request Checklist
Image Details
Pull Request Details
What this PR does / why we need it:
NodeJS is not installed to the JSS CM / CD Docker containers, which causes integrated mode to fail.
Web.config transform was not run for JSS containers, and SXA CD containers
Which issue(s) this PR fixes:
Fixes #386
Fixes #387
Special notes for your reviewer:
This PR is a replacement of #416 with squashed commits
I have successfully imported the Sitecore JSS React Sample application into the CM SXA+JSS container. Experience Editor is also functioning as it should.
I have created a new test folder for v10.0.0 XM1 with JSS latest and that is the test compose files I have used. I originally copied this from the XP1 compose folders and have realised there are a few small issues in that compose files. I will raise an issue to get this fixed once this PR is merged.
Pre-submit Checklist
I have read and am familiar with the contents of CONTRIBUTING.md
I have built the images locally (all relevant OS versions, including Linux if applicable)
.\build.ps1
command used (don't forget to exclude your credentials!)Ensure the build was done on a clean system (
docker system prune -af
)I have added or updated the necessary docker-compose file(s) in the
build/windows/tests
folderI have updated the documentation using
build\update-documentation.ps1
I have updated the
build\CHANGELOG.md
with details about the change(s) included