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

Feature/adding911 flavors #292

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

rabehaja
Copy link

Added some SXA, JSS, SPE variants for the Sitecore 9.1.1 docker images.

@bplasmeijer
Copy link
Member

---TESTING---

Copy link
Member

@bplasmeijer bplasmeijer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • please rebase branch with origin/master
  • remove xc data folders from 9.1.1
  • fix comments

windows/tests/9.1.x/docker-compose.xp.sxa copy.yml Outdated Show resolved Hide resolved
windows/9.1.x/sitecore-xp-identity/build.json Outdated Show resolved Hide resolved
windows/9.1.x/sitecore-xp-identity/build.json Outdated Show resolved Hide resolved
windows/tests/9.1.x/README.md Outdated Show resolved Hide resolved
windows/tests/9.1.x/README.md Outdated Show resolved Hide resolved
@bplasmeijer bplasmeijer removed their assignment Jul 6, 2020
@bplasmeijer bplasmeijer added question Further information is requested and removed QA running labels Jul 6, 2020
@bplasmeijer
Copy link
Member

please review changes @rabehaja

@rabehaja
Copy link
Author

rabehaja commented Jul 7, 2020

@bplasmeijer I will check it in tonight :)

@rabehaja
Copy link
Author

rabehaja commented Jul 7, 2020

Rebase is done

@rabehaja
Copy link
Author

rabehaja commented Jul 7, 2020

Changes have been implemented, rebase executed. Please check

@rabehaja rabehaja requested a review from bplasmeijer July 7, 2020 21:33
adding the missing files

reset the default value to 9.3.0

remove comments

moved the sitecore-xm folder to the proper folder to follow general
structure

Update .env

removed my container name

removed xc datafolders, updated readme with the correct values, updated
the changelog, updated contributor list, removed duplicate compose file

updating the images list

adding the missing files

reset the default value to 9.3.0

remove comments

moved the sitecore-xm folder to the proper folder to follow general
structure

Update .env

removed my container name

adding the missing files

reset the default value to 9.3.0

remove comments

moved the sitecore-xm folder to the proper folder to follow general
structure

Update .env

removed my container name

removed xc datafolders, updated readme with the correct values, updated
the changelog, updated contributor list, removed duplicate compose file

updating the images list

adding the missing files

reset the default value to 9.3.0

remove comments

moved the sitecore-xm folder to the proper folder to follow general
structure

Update .env

removed my container name

removed xc datafolders, updated readme with the correct values, updated
the changelog, updated contributor list, removed duplicate compose file

running the formatting standard for workspace

adding the 9.1.1 images for SXA, JSS, SPE

adding the missing files

reset the default value to 9.3.0

remove comments

moved the sitecore-xm folder to the proper folder to follow general
structure

Update .env

removed my container name

removed xc datafolders, updated readme with the correct values, updated
the changelog, updated contributor list, removed duplicate compose file

adding the 9.1.1 images for SXA, JSS, SPE

adding the missing files

reset the default value to 9.3.0

remove comments

moved the sitecore-xm folder to the proper folder to follow general
structure

Update .env

removed my container name

removed xc datafolders, updated readme with the correct values, updated
the changelog, updated contributor list, removed duplicate compose file

adding the vs folder to the git ignore
@rabehaja rabehaja force-pushed the feature/adding911_flavors branch from 9eebb60 to 93c35fb Compare July 10, 2020 12:10
@bplasmeijer
Copy link
Member

Hi @rabehaja

Sorry for the wait, we do have a new structure in place on docker-images, if you want to rebase, and apply to the new folder structure we can then accept your PR after QA.

Otherwise close PR.

Thanks
Bart

@bplasmeijer bplasmeijer self-assigned this Nov 6, 2020
@rabehaja
Copy link
Author

rabehaja commented Dec 1, 2020

Hi,

I will make a rebase on the main branch and re submit

@gravypower
Copy link

Hello, I am working on 9.1.0 and wondering if this PR was going to be merged? If so I will conform with it.

@jeanfrancoislarente
Copy link
Member

Hello, I am working on 9.1.0 and wondering if this PR was going to be merged? If so I will conform with it.

At this moment it's a massive change on legacy versions. If someone wanted to pick up the rebase and submit I will commit to testing and running it.

@jeanfrancoislarente jeanfrancoislarente added the help wanted Extra attention is needed label Jan 6, 2021
@gravypower
Copy link

Seems like a lot of formatting changes across many versions. I wonder if it should only add support for 9.1.1?

@jeanfrancoislarente
Copy link
Member

Seems like a lot of formatting changes across many versions. I wonder if it should only add support for 9.1.1?

That’s definitely acceptable

@gravypower
Copy link

@rabehaja did you want collaborate on a new PR that brings support for 9.1.x? we can start fresh and ensure that we don't pushing in any changes to files that impact other versions.

@rabehaja
Copy link
Author

rabehaja commented Jan 6, 2021

@gravypower let's collab :)

@jeanfrancoislarente
Copy link
Member

@gravypower @rabehaja Please note the current issue #388 in the repo where sitecore-tags.md is marked as modified even when it isn't. It's a major PITA to work with if you mistakenly add it to one of your commits (since it's not supposed to be modified by the community).

Upon initial checkout, and often during a pull, etc. you will see the issue. To clear it up locally, ensure you have no other pending changes (stash them, except for sitecore-tags.md file if you do) and run:

git rm .gitattributes
git add -A
git reset --hard

Then you can carry on with your other commands/action.

@gravypower
Copy link

Great @rabehaja :)

Ah that's why I could not revert that file, thanks for the tip @jeanfrancoislarente.

@gravypower
Copy link

@rabehaja I have moved your changes (that I can see) here https://github.com/gravypower/docker-images. Are you happy to work from this fork?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request help wanted Extra attention is needed question Further information is requested
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants