Skip to content
This repository has been archived by the owner on Jan 21, 2024. It is now read-only.

breaking: use a ltsc2019 base image for windowsservercore-ltsc2019 agent images and add a nanoserver-ltsc2019 image #396

Merged

Conversation

lemeurherve
Copy link
Member

@lemeurherve lemeurherve commented Sep 7, 2023

This PR refactors the build like what have been done in jenkinsci/docker-agent#459, with proper (new) windowsservercore-1809 and windowsservercore-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 both nanoserver and windowsservercore 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

image

Testing done

https://ci.jenkins.io/job/Packaging/job/docker-inbound-agent/job/PR-396/16/

Submitter checklist

@lemeurherve lemeurherve force-pushed the refactor-like-docker-agent-pr-459 branch 4 times, most recently from a0237f2 to 45236a1 Compare September 7, 2023 23:25
@lemeurherve lemeurherve force-pushed the refactor-like-docker-agent-pr-459 branch from 45236a1 to 8a006a5 Compare September 7, 2023 23:26
@lemeurherve lemeurherve changed the title wip: refactor like jenkinsci/docker-agent#459 feat!: refactor like jenkinsci/docker-agent#459 Sep 8, 2023
@lemeurherve lemeurherve changed the title feat!: refactor like jenkinsci/docker-agent#459 breaking: refactor like jenkinsci/docker-agent#459 Sep 8, 2023
@lemeurherve lemeurherve marked this pull request as ready for review September 8, 2023 15:47
@lemeurherve lemeurherve requested a review from a team as a code owner September 8, 2023 15:47
@lemeurherve
Copy link
Member Author

lemeurherve commented Sep 8, 2023

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 :trollface:

Will be dealt with later.

Copy link
Contributor

@dduportal dduportal left a 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 :trollface:

Good new, it's a container image :trollface:

LGTM! Let's follow up on the pester "character" issue in jenkinsci/docker-ssh-agent#295 (comment)

@dduportal dduportal merged commit 4b80e05 into jenkinsci:master Sep 8, 2023
9 checks passed
@dduportal dduportal changed the title breaking: refactor like jenkinsci/docker-agent#459 breaking: use a ltsc2019 base image for windowsservercore-ltsc2019 agent images and add a nanoserver-ltsc2019 image Sep 8, 2023
@lemeurherve lemeurherve deleted the refactor-like-docker-agent-pr-459 branch September 15, 2023 16:26
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants