-
-
Notifications
You must be signed in to change notification settings - Fork 229
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
breaking: use a ltsc2019
base image for windowsservercore-ltsc2019
agent images
#459
Merged
Merged
Changes from all commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
560bc47
feat: add `nanoserver-ltsc2019` tags
lemeurherve 89f829d
Merge branch 'master' into patch-4
lemeurherve 59bff44
Merge branch 'master' into patch-4
lemeurherve 7dfd8e3
debug prepared images list
lemeurherve 815db71
fixup
lemeurherve b486c16
fixup
lemeurherve cd8c998
remove output, done in https://github.com/jenkinsci/docker-agent/pull…
lemeurherve 23509f0
Merge branch 'master' into patch-4
lemeurherve bb6f520
Merge branch 'master' into patch-4
dduportal 0b43eac
Also take care of the default jdk image tag 'nanoserver-ltsc2019'
lemeurherve c331622
fixup
lemeurherve 98eb64d
ticks around jdk in comments
lemeurherve 580ef8b
fix: additional nanoserver-ltsc2019 image and tags
lemeurherve 32094fd
introduce IMAGE_TYPE
lemeurherve 24b8891
Merge branch 'master' into patch-4
lemeurherve e8ec3c7
Switch from powershell:<windows_flavor>-<windows_tag> to windows/<win…
lemeurherve 23bffe8
do not build additional images for now
lemeurherve d630bf4
Add `windowsservercore-1809` image
lemeurherve 23c6c2f
simplify
lemeurherve 8048622
'real' context
lemeurherve 9c8cc5b
add --dockerfile to windows tests
lemeurherve fa57555
show org/repo in logs
lemeurherve a800236
fix env var name in test
lemeurherve 5819d4d
don't use snake case for env vars used only in the tests
lemeurherve 903f427
Merge branch 'master' into patch-4
lemeurherve eb4d1f6
Merge branch 'master' into patch-4
lemeurherve 31a258b
Merge branch 'master' into patch-4
lemeurherve 458f4c7
Update build-windows.yaml
dduportal 0e667d7
Merge branch 'master' into patch-4
dduportal 736c1f4
Merge branch 'master' into patch-4
dduportal 2ac08d4
replace WINDOWS_VERSION_FALLBACK_TAG by TOOLS_WINDOWS_VERSION
lemeurherve 7c2cec1
revert to CRLF on build.ps1
lemeurherve 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,37 +1,23 @@ | ||
services: | ||
jdk11-nanoserver: | ||
image: jdk11-nanoserver-${NANOSERVER_VERSION_NAME} | ||
jdk11: | ||
image: jdk11-${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG} | ||
build: | ||
context: ./windows/nanoserver/ | ||
context: ./ | ||
dockerfile: ./windows/${WINDOWS_FLAVOR}/Dockerfile | ||
args: | ||
JAVA_HOME: "C:/openjdk-11" | ||
JAVA_VERSION: 11.0.20.1_1 | ||
VERSION: ${REMOTING_VERSION} | ||
WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG} | ||
jdk17-nanoserver: | ||
image: jdk17-nanoserver-${NANOSERVER_VERSION_NAME} | ||
TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION} | ||
jdk17: | ||
image: jdk17-${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG} | ||
build: | ||
context: ./windows/nanoserver/ | ||
args: | ||
JAVA_HOME: "C:/openjdk-17" | ||
JAVA_VERSION: 17.0.8.1_1 | ||
VERSION: ${REMOTING_VERSION} | ||
WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG} | ||
jdk11-windowsservercore: | ||
image: jdk11-windowsservercore-${WINDOWS_VERSION_NAME} | ||
build: | ||
context: ./windows/windowsservercore/ | ||
args: | ||
JAVA_HOME: "C:/openjdk-11" | ||
JAVA_VERSION: 11.0.20.1_1 | ||
VERSION: ${REMOTING_VERSION} | ||
WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG} | ||
jdk17-windowsservercore: | ||
image: jdk17-windowsservercore-${WINDOWS_VERSION_NAME} | ||
build: | ||
context: ./windows/windowsservercore/ | ||
context: ./ | ||
dockerfile: ./windows/${WINDOWS_FLAVOR}/Dockerfile | ||
args: | ||
JAVA_HOME: "C:/openjdk-17" | ||
JAVA_VERSION: 17.0.8.1_1 | ||
VERSION: ${REMOTING_VERSION} | ||
WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG} | ||
TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION} |
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
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.
nit: I can't remember why we "simplified" so much the compose file. As much as I want to factorize the Dockerfile (which has duplicated logic), I wonder if using the docker-compose to describe (and pass) all kinds of definition we need, like the bakefile, wouldn't help to clarify (and avoid tedious "if then else" in the powershell) ?
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.
This is related to #459 (comment)
There is no "else" in the PowerShell script, what are the tedious parts you're alluding to?
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.
As far as I remember, #459 (comment) was before you worked into splitting the image build in different lines (in different agents) so I considered it outdated.
https://github.com/jenkinsci/docker-agent/pull/459/files#diff-3258bc4162690adead72c70b672093e68c92e86a4628148f0015d61738f21b5aR75-R77
While reviewing the PR, I realized that we store part of the definitions in the compose YAML manifest and the other part in code like this one. I have not a solution for it yet (and it is not blocking the PR) but I believe that we should be able to define the logic ltsc2019 (tools at 1809, base at ltsc2019) / 1809 (all in 1809) / ltsc2022 (all in ltsc2022) in one (or multiple) compose files to avoid splitting intelligence between "definition" and "programmatic".
I can totally take a try at this once we have started to deliver the image if ok for you?
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.
(don't get me wrong, your work is really good here, I'm nitpicking here!)