This repository has been archived by the owner on Jan 21, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 525
breaking: use a ltsc2019
base image for windowsservercore-ltsc2019 agent images and add a nanoserver-ltsc2019
image
#396
Merged
dduportal
merged 14 commits into
jenkinsci:master
from
lemeurherve:refactor-like-docker-agent-pr-459
Sep 8, 2023
Merged
breaking: use a ltsc2019
base image for windowsservercore-ltsc2019 agent images and add a nanoserver-ltsc2019
image
#396
dduportal
merged 14 commits into
jenkinsci:master
from
lemeurherve:refactor-like-docker-agent-pr-459
Sep 8, 2023
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
lemeurherve
force-pushed
the
refactor-like-docker-agent-pr-459
branch
4 times, most recently
from
September 7, 2023 23:25
a0237f2
to
45236a1
Compare
lemeurherve
force-pushed
the
refactor-like-docker-agent-pr-459
branch
from
September 7, 2023 23:26
45236a1
to
8a006a5
Compare
… & windowsservercore-1809 variants
lemeurherve
changed the title
wip: refactor like jenkinsci/docker-agent#459
feat!: refactor like jenkinsci/docker-agent#459
Sep 8, 2023
lemeurherve
changed the title
feat!: refactor like jenkinsci/docker-agent#459
breaking: refactor like jenkinsci/docker-agent#459
Sep 8, 2023
This reverts commit 978db1f.
Commenting out the test which fails here because of 0x1b escape character, crashing Pester when it tries to generate the XML export for JUnit: 9cd8ecb Works correctly on my machine Will be dealt with later. |
dduportal
approved these changes
Sep 8, 2023
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.
Works correctly on my machine
Good new, it's a container image
LGTM! Let's follow up on the pester "character" issue in jenkinsci/docker-ssh-agent#295 (comment)
dduportal
changed the title
breaking: refactor like jenkinsci/docker-agent#459
breaking: use a Sep 8, 2023
ltsc2019
base image for windowsservercore-ltsc2019 agent images and add a nanoserver-ltsc2019
image
lemeurherve
pushed a commit
to lemeurherve/jenkinsci-docker-inbound-agent
that referenced
this pull request
Nov 19, 2023
lemeurherve
added a commit
to lemeurherve/docker-agent
that referenced
this pull request
Nov 28, 2023
…meurherve/refactor-like-docker-agent-pr-459 breaking: refactor like jenkinsci#459
lemeurherve
added a commit
to lemeurherve/docker-agent
that referenced
this pull request
Nov 28, 2023
…meurherve/refactor-like-docker-agent-pr-459 breaking: refactor like jenkinsci#459
lemeurherve
added a commit
to lemeurherve/docker-agent
that referenced
this pull request
Nov 28, 2023
…meurherve/refactor-like-docker-agent-pr-459 breaking: refactor like jenkinsci#459
lemeurherve
added a commit
to lemeurherve/docker-agent
that referenced
this pull request
Nov 28, 2023
…meurherve/refactor-like-docker-agent-pr-459 breaking: refactor like jenkinsci#459
lemeurherve
added a commit
to lemeurherve/docker-agent
that referenced
this pull request
Nov 28, 2023
…meurherve/refactor-like-docker-agent-pr-459 breaking: refactor like jenkinsci#459
lemeurherve
added a commit
to lemeurherve/docker-agent
that referenced
this pull request
Nov 28, 2023
…meurherve/refactor-like-docker-agent-pr-459 breaking: refactor like jenkinsci#459
lemeurherve
added a commit
to lemeurherve/docker-agent
that referenced
this pull request
Nov 28, 2023
…meurherve/refactor-like-docker-agent-pr-459 breaking: refactor like jenkinsci#459
lemeurherve
added a commit
to lemeurherve/docker-agent
that referenced
this pull request
Nov 28, 2023
…meurherve/refactor-like-docker-agent-pr-459 breaking: refactor like jenkinsci#459
lemeurherve
added a commit
to lemeurherve/docker-agent
that referenced
this pull request
Nov 28, 2023
…meurherve/refactor-like-docker-agent-pr-459 breaking: refactor like jenkinsci#459
lemeurherve
referenced
this pull request
in lemeurherve/docker-agent
Dec 3, 2023
lemeurherve
pushed a commit
to lemeurherve/docker-agent
that referenced
this pull request
Jan 12, 2024
…e/refactor-like-docker-agent-pr-459 breaking: refactor like jenkinsci#459
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR refactors the build like what have been done in jenkinsci/docker-agent#459, with proper (new)
windowsservercore-1809
andwindowsservercore-ltsc2019
images (with corresponding base images).It also add a
nanoserver-ltsc2019
image, same as jenkinsci/docker-agent#488.And it updates the docker-agent parent image version to the one including
nanoserver-ltsc2019
&windowsservercore-1809
variants. (Supersedes and closes #398)https://hub.docker.com/r/jenkins/agent/tags?page=1&name=nanoserver-ltsc2019
While I was at it and since these Windows images are just "patches" on top of the docker-agent ones, I've also regrouped bothnanoserver
andwindowsservercore
in a unique Dockerfile, simplifying a bit more the logic.Unfortunately it's not possible to get env var substitution with the exec form of ENTRYPOINT like
ENTRYPOINT ["${CONTAINER_SHELL}", "-f", "C:/ProgramData/Jenkins/jenkins-agent.ps1"]
: https://docs.docker.com/engine/reference/builder/#exec-form-entrypoint-example(Changing it to a shell form would be a breaking change too important).
FWIW, screenshot unique Dockerfile tentative
Testing done
https://ci.jenkins.io/job/Packaging/job/docker-inbound-agent/job/PR-396/16/ ✅
Submitter checklist