-
Notifications
You must be signed in to change notification settings - Fork 93
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
Update dockerfiles #701
Open
thatnerdjosh
wants to merge
6
commits into
ryzom:core4
Choose a base branch
from
OmnidApps:support/update_dockerfiles
base: core4
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Update dockerfiles #701
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
eaa6beb
Convert line endings for some files
thatnerdjosh b397d39
Install newer CMake as per CMakeList requirements.
thatnerdjosh 0c46f91
Update repository reference
thatnerdjosh 133e79a
Migrate from deprecated MAINTAINER command.
thatnerdjosh c331f39
Add insert_final_newline
thatnerdjosh 3913aba
Add end_of_line setting
thatnerdjosh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,106 +1,106 @@ | ||
| BODY {background:#FFFFFF} | ||
| .menuItem { | ||
| font-family:sans-serif; font-size:small; | ||
| width:220;padding-left:20; | ||
| background-color:menu; | ||
| color:black | ||
| } | ||
| .highlightItem { | ||
| font-family:sans-serif; font-size:small; | ||
| width:220; padding-left:20; | ||
| background-Color:highlight; color:white; | ||
| } | ||
| .navBar { | ||
| background-Color:buttonface; | ||
| } | ||
| .oldNavBar { | ||
| background-Color:black; | ||
| } | ||
| .pageView { | ||
| background-Color:white; | ||
| } | ||
| .propViewer { | ||
| background-Color:white; | ||
| color: black; | ||
| font-family: Verdana; | ||
| font-style: italic; | ||
| font-weight: bold; | ||
| font-size: medium; | ||
| text-align: center; | ||
| } | ||
| .propViewerTABLE { | ||
| background-Color: black; | ||
| font-weight: medium; | ||
| border-width: 1pt; | ||
| border-color: black; | ||
| } | ||
| .propViewerTHEAD { | ||
| background-Color: rgb(230,230,230); | ||
| color: black; | ||
| font-family: Verdana; | ||
| font-style: italic; | ||
| font-weight: medium; | ||
| font-size: small; | ||
| } | ||
| .propViewerHeaderSep { | ||
| background-Color: black; | ||
| height: 0pt; | ||
| } | ||
| .propViewerLines { | ||
| background-Color: black; | ||
| height: 2pt; | ||
| } | ||
| .propViewerTD { | ||
| font-family: Verdana; | ||
| color: black; | ||
| font-size: x-small; | ||
| font-style: normal; | ||
| align: center; | ||
| } | ||
| .propViewerEvenRow { | ||
| background-Color: rgb(253,254,238); | ||
| } | ||
| .propViewerOddRow { | ||
| background-Color: rgb(254,254,247); | ||
| } | ||
| .clTab { | ||
| cursor:hand; | ||
| background:buttonface; | ||
| font: 0.7em Arial; | ||
| padding-left:3px; | ||
| padding-right:3px; | ||
| text-align:center; | ||
| } | ||
| .clBorder { | ||
| background:windowframe; | ||
| font:1pt; | ||
| } | ||
| .clScroll { | ||
| font:8pt Courier New; | ||
| color:threeddarkshadow; | ||
| cursor:default; | ||
| line-height:10pt; | ||
| } | ||
| .clScroll2 { | ||
| font:10pt Arial; | ||
| color:threeddarkshadow; | ||
| cursor:default; | ||
| line-height:11pt; | ||
| } | ||
| BODY {background:#FFFFFF} | ||
|
|
||
| .menuItem { | ||
| font-family:sans-serif; font-size:small; | ||
| width:220;padding-left:20; | ||
| background-color:menu; | ||
| color:black | ||
| } | ||
|
|
||
| .highlightItem { | ||
| font-family:sans-serif; font-size:small; | ||
| width:220; padding-left:20; | ||
| background-Color:highlight; color:white; | ||
| } | ||
|
|
||
| .navBar { | ||
| background-Color:buttonface; | ||
| } | ||
|
|
||
| .oldNavBar { | ||
| background-Color:black; | ||
| } | ||
|
|
||
| .pageView { | ||
| background-Color:white; | ||
| } | ||
|
|
||
| .propViewer { | ||
| background-Color:white; | ||
| color: black; | ||
| font-family: Verdana; | ||
| font-style: italic; | ||
| font-weight: bold; | ||
| font-size: medium; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .propViewerTABLE { | ||
| background-Color: black; | ||
| font-weight: medium; | ||
| border-width: 1pt; | ||
| border-color: black; | ||
| } | ||
|
|
||
| .propViewerTHEAD { | ||
| background-Color: rgb(230,230,230); | ||
| color: black; | ||
| font-family: Verdana; | ||
| font-style: italic; | ||
| font-weight: medium; | ||
| font-size: small; | ||
| } | ||
|
|
||
| .propViewerHeaderSep { | ||
| background-Color: black; | ||
| height: 0pt; | ||
| } | ||
|
|
||
| .propViewerLines { | ||
| background-Color: black; | ||
| height: 2pt; | ||
| } | ||
|
|
||
| .propViewerTD { | ||
| font-family: Verdana; | ||
| color: black; | ||
| font-size: x-small; | ||
| font-style: normal; | ||
| align: center; | ||
| } | ||
|
|
||
| .propViewerEvenRow { | ||
| background-Color: rgb(253,254,238); | ||
| } | ||
|
|
||
| .propViewerOddRow { | ||
| background-Color: rgb(254,254,247); | ||
| } | ||
|
|
||
| .clTab { | ||
| cursor:hand; | ||
| background:buttonface; | ||
| font: 0.7em Arial; | ||
| padding-left:3px; | ||
| padding-right:3px; | ||
| text-align:center; | ||
| } | ||
|
|
||
| .clBorder { | ||
| background:windowframe; | ||
| font:1pt; | ||
| } | ||
|
|
||
| .clScroll { | ||
| font:8pt Courier New; | ||
| color:threeddarkshadow; | ||
| cursor:default; | ||
| line-height:10pt; | ||
| } | ||
|
|
||
| .clScroll2 { | ||
| font:10pt Arial; | ||
| color:threeddarkshadow; | ||
| cursor:default; | ||
| line-height:11pt; | ||
| } |
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.
All our line endings are set to platform native in git configuration.
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.
Ok - the issue I was having is most files were checked in LF, but there were some files which were CRLF in the repo, which caused the branch to be dirty immediately on checkout. Do you have a solution for this?
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, they should be in LF in the repo, so committing the LF files is the correct fix for that. Just local storage should be in native.
See https://github.com/ryzom/ryzomcore/blob/core4/.gitattributes
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.
Those defective files might've been committed before the .gitattributes was cleaned up.
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.
Amazing - I'll remove this editorconfig change then as it's not necessary