Skip to content
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

Conversation

vtml
Copy link
Contributor

@vtml vtml commented Dec 7, 2020

Pull Request Checklist

Image Details

  • I have added NEW image tags
  • I have made significant changes to existing images

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)

    • Include the .\build.ps1 command used (don't forget to exclude your credentials!)
.\Build.ps1 -InstallSourcePath -SitecoreUsername "fdsa" -SitecorePassword "fdsa" -OSVersion @("2004", "1909", "ltsc2019") -IncludeSpe -IncludeSxa -IncludeJss -SkipExistingImage
  • 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 folder

  • I have updated the documentation using build\update-documentation.ps1

  • I have updated the build\CHANGELOG.md with details about the change(s) included

vtml added 3 commits November 27, 2020 22:42
* 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 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
@jeanfrancoislarente
Copy link
Member

Please remove any changes you may have made to sitecore-tags.md - this is a Sitecore-only modified file.

@vtml
Copy link
Contributor Author

vtml commented Dec 7, 2020

Please remove any changes you may have made to sitecore-tags.md - this is a Sitecore-only modified file.

Done

vtml and others added 27 commits December 12, 2020 22:30
* 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]>
* 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]>
* 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]>
@vtml
Copy link
Contributor Author

vtml commented Dec 15, 2020

Apologies with all the commits @jeanfrancoislarente, I was in some merge conflict hell with another branch. This PR is now ready to review.

@jeanfrancoislarente jeanfrancoislarente merged commit be8ac16 into Sitecore:master Dec 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants