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.

Sign up for GitHub

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

Jump to bottom

breaking(Linux): short tags targeting Java 17 instead of Java 11 #400

Merged
merged 4 commits into from May 13, 2024
Merged

breaking(Linux): short tags targeting Java 17 instead of Java 11 #400

merged 4 commits into from May 13, 2024

Conversation

lemeurherve
Copy link
Member

@lemeurherve lemeurherve commented May 8, 2024 •
edited

This PR changes the short tags to target Java 17 (current default JDK version for Jenkins) instead of Java 11.

The Windows images short tags are already JDK17 ones.

Concerned short tags (3 Alpine and 2 Debian):

  • "docker.io/jenkins/ssh-agent:alpine"
  • "docker.io/jenkins/ssh-agent:alpine3.19"
  • "docker.io/jenkins/ssh-agent:latest-alpine3.19"
  • "docker.io/jenkins/ssh-agent:latest"
  • "docker.io/jenkins/ssh-agent:<version>"

Closes:

Testing done

Compared the output of docker buildx bake --file docker-bake.hcl linux --print with VERSION=1.2.3 & ON_TAG=true:

Before 
{
  "group": {
    "default": {
      "targets": [
        "linux"
      ]
    },
    "linux": {
      "targets": [
        "alpine_jdk11",
        "alpine_jdk17",
        "alpine_jdk21",
        "debian_jdk11",
        "debian_jdk17",
        "debian_jdk21",
        "debian_jdk21-preview"
      ]
    }
  },
  "target": {
    "alpine_jdk11": {
      "context": ".",
      "dockerfile": "alpine/Dockerfile",
      "args": {
        "ALPINE_TAG": "3.19.1",
        "JAVA_VERSION": "11.0.23_9"
      },
      "tags": [
        "docker.io/jenkins/ssh-agent:1.2.3-alpine-jdk11",
        "docker.io/jenkins/ssh-agent:1.2.3-alpine3.19-jdk11",
        "docker.io/jenkins/ssh-agent:alpine",
        "docker.io/jenkins/ssh-agent:alpine-jdk11",
        "docker.io/jenkins/ssh-agent:latest-alpine-jdk11",
        "docker.io/jenkins/ssh-agent:alpine3.19",
        "docker.io/jenkins/ssh-agent:alpine3.19-jdk11",
        "docker.io/jenkins/ssh-agent:latest-alpine3.19-jdk11",
        "docker.io/jenkins/ssh-agent:latest-alpine3.19"
      ],
      "platforms": [
        "linux/amd64"
      ]
    },
    "alpine_jdk17": {
      "context": ".",
      "dockerfile": "alpine/Dockerfile",
      "args": {
        "ALPINE_TAG": "3.19.1",
        "JAVA_VERSION": "17.0.11_9"
      },
      "tags": [
        "docker.io/jenkins/ssh-agent:1.2.3-alpine-jdk17",
        "docker.io/jenkins/ssh-agent:1.2.3-alpine3.19-jdk17",
        "docker.io/jenkins/ssh-agent:alpine-jdk17",
        "docker.io/jenkins/ssh-agent:latest-alpine-jdk17",
        "docker.io/jenkins/ssh-agent:alpine3.19-jdk17",
        "docker.io/jenkins/ssh-agent:latest-alpine3.19-jdk17"
      ],
      "platforms": [
        "linux/amd64"
      ]
    },
    "alpine_jdk21": {
      "context": ".",
      "dockerfile": "alpine/Dockerfile",
      "args": {
        "ALPINE_TAG": "3.19.1",
        "JAVA_VERSION": "21.0.3_9"
      },
      "tags": [
        "docker.io/jenkins/ssh-agent:1.2.3-alpine-jdk21",
        "docker.io/jenkins/ssh-agent:1.2.3-alpine3.19-jdk21",
        "docker.io/jenkins/ssh-agent:alpine-jdk21",
        "docker.io/jenkins/ssh-agent:latest-alpine-jdk21",
        "docker.io/jenkins/ssh-agent:alpine3.19-jdk21",
        "docker.io/jenkins/ssh-agent:latest-alpine3.19-jdk21"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64"
      ]
    },
    "debian_jdk11": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "DEBIAN_RELEASE": "bookworm-20240423",
        "JAVA_VERSION": "11.0.23_9"
      },
      "tags": [
        "docker.io/jenkins/ssh-agent:1.2.3",
        "docker.io/jenkins/ssh-agent:1.2.3-jdk11",
        "docker.io/jenkins/ssh-agent:bookworm-jdk11",
        "docker.io/jenkins/ssh-agent:debian-jdk11",
        "docker.io/jenkins/ssh-agent:jdk11",
        "docker.io/jenkins/ssh-agent:latest",
        "docker.io/jenkins/ssh-agent:latest-bookworm-jdk11",
        "docker.io/jenkins/ssh-agent:latest-debian-jdk11",
        "docker.io/jenkins/ssh-agent:latest-jdk11"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/s390x",
        "linux/ppc64le"
      ]
    },
    "debian_jdk17": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "DEBIAN_RELEASE": "bookworm-20240423",
        "JAVA_VERSION": "17.0.11_9"
      },
      "tags": [
        "docker.io/jenkins/ssh-agent:1.2.3-jdk17",
        "docker.io/jenkins/ssh-agent:bookworm-jdk17",
        "docker.io/jenkins/ssh-agent:debian-jdk17",
        "docker.io/jenkins/ssh-agent:jdk17",
        "docker.io/jenkins/ssh-agent:latest-bookworm-jdk17",
        "docker.io/jenkins/ssh-agent:latest-debian-jdk17",
        "docker.io/jenkins/ssh-agent:latest-jdk17"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/ppc64le"
      ]
    },
    "debian_jdk21": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "DEBIAN_RELEASE": "bookworm-20240423",
        "JAVA_VERSION": "21.0.3_9"
      },
      "tags": [
        "docker.io/jenkins/ssh-agent:1.2.3-jdk21",
        "docker.io/jenkins/ssh-agent:bookworm-jdk21",
        "docker.io/jenkins/ssh-agent:debian-jdk21",
        "docker.io/jenkins/ssh-agent:jdk21",
        "docker.io/jenkins/ssh-agent:latest-bookworm-jdk21",
        "docker.io/jenkins/ssh-agent:latest-debian-jdk21",
        "docker.io/jenkins/ssh-agent:latest-jdk21"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/ppc64le",
        "linux/s390x"
      ]
    },
    "debian_jdk21-preview": {
      "context": ".",
      "dockerfile": "debian/preview/Dockerfile",
      "args": {
        "DEBIAN_RELEASE": "bookworm-20240423",
        "JAVA_VERSION": "21.0.1+12"
      },
      "tags": [
        "docker.io/jenkins/ssh-agent:1.2.3-jdk21-preview",
        "docker.io/jenkins/ssh-agent:bookworm-jdk21-preview",
        "docker.io/jenkins/ssh-agent:debian-jdk21-preview",
        "docker.io/jenkins/ssh-agent:jdk21-preview",
        "docker.io/jenkins/ssh-agent:latest-bookworm-jdk21-preview",
        "docker.io/jenkins/ssh-agent:latest-debian-jdk21-preview",
        "docker.io/jenkins/ssh-agent:latest-jdk21-preview"
      ],
      "platforms": [
        "linux/arm/v7"
      ]
    }
  }
}
After 
{
  "group": {
    "default": {
      "targets": [
        "linux"
      ]
    },
    "linux": {
      "targets": [
        "alpine_jdk11",
        "alpine_jdk17",
        "alpine_jdk21",
        "debian_jdk11",
        "debian_jdk17",
        "debian_jdk21",
        "debian_jdk21-preview"
      ]
    }
  },
  "target": {
    "alpine_jdk11": {
      "context": ".",
      "dockerfile": "alpine/Dockerfile",
      "args": {
        "ALPINE_TAG": "3.19.1",
        "JAVA_VERSION": "11.0.23_9"
      },
      "tags": [
        "docker.io/jenkins/ssh-agent:1.2.3-alpine-jdk11",
        "docker.io/jenkins/ssh-agent:1.2.3-alpine3.19-jdk11",
        "docker.io/jenkins/ssh-agent:alpine-jdk11",
        "docker.io/jenkins/ssh-agent:latest-alpine-jdk11",
        "docker.io/jenkins/ssh-agent:alpine3.19-jdk11",
        "docker.io/jenkins/ssh-agent:latest-alpine3.19-jdk11"
      ],
      "platforms": [
        "linux/amd64"
      ]
    },
    "alpine_jdk17": {
      "context": ".",
      "dockerfile": "alpine/Dockerfile",
      "args": {
        "ALPINE_TAG": "3.19.1",
        "JAVA_VERSION": "17.0.11_9"
      },
      "tags": [
        "docker.io/jenkins/ssh-agent:1.2.3-alpine-jdk17",
        "docker.io/jenkins/ssh-agent:1.2.3-alpine3.19-jdk17",
        "docker.io/jenkins/ssh-agent:alpine",
        "docker.io/jenkins/ssh-agent:alpine-jdk17",
        "docker.io/jenkins/ssh-agent:latest-alpine-jdk17",
        "docker.io/jenkins/ssh-agent:alpine3.19",
        "docker.io/jenkins/ssh-agent:alpine3.19-jdk17",
        "docker.io/jenkins/ssh-agent:latest-alpine3.19",
        "docker.io/jenkins/ssh-agent:latest-alpine3.19-jdk17"
      ],
      "platforms": [
        "linux/amd64"
      ]
    },
    "alpine_jdk21": {
      "context": ".",
      "dockerfile": "alpine/Dockerfile",
      "args": {
        "ALPINE_TAG": "3.19.1",
        "JAVA_VERSION": "21.0.3_9"
      },
      "tags": [
        "docker.io/jenkins/ssh-agent:1.2.3-alpine-jdk21",
        "docker.io/jenkins/ssh-agent:1.2.3-alpine3.19-jdk21",
        "docker.io/jenkins/ssh-agent:alpine-jdk21",
        "docker.io/jenkins/ssh-agent:latest-alpine-jdk21",
        "docker.io/jenkins/ssh-agent:alpine3.19-jdk21",
        "docker.io/jenkins/ssh-agent:latest-alpine3.19-jdk21"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64"
      ]
    },
    "debian_jdk11": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "DEBIAN_RELEASE": "bookworm-20240423",
        "JAVA_VERSION": "11.0.23_9"
      },
      "tags": [
        "docker.io/jenkins/ssh-agent:1.2.3-jdk11",
        "docker.io/jenkins/ssh-agent:bookworm-jdk11",
        "docker.io/jenkins/ssh-agent:debian-jdk11",
        "docker.io/jenkins/ssh-agent:jdk11",
        "docker.io/jenkins/ssh-agent:latest-bookworm-jdk11",
        "docker.io/jenkins/ssh-agent:latest-debian-jdk11",
        "docker.io/jenkins/ssh-agent:latest-jdk11"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/s390x",
        "linux/ppc64le"
      ]
    },
    "debian_jdk17": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "DEBIAN_RELEASE": "bookworm-20240423",
        "JAVA_VERSION": "17.0.11_9"
      },
      "tags": [
        "docker.io/jenkins/ssh-agent:1.2.3",
        "docker.io/jenkins/ssh-agent:1.2.3-jdk17",
        "docker.io/jenkins/ssh-agent:bookworm-jdk17",
        "docker.io/jenkins/ssh-agent:debian-jdk17",
        "docker.io/jenkins/ssh-agent:jdk17",
        "docker.io/jenkins/ssh-agent:latest",
        "docker.io/jenkins/ssh-agent:latest-bookworm-jdk17",
        "docker.io/jenkins/ssh-agent:latest-debian-jdk17",
        "docker.io/jenkins/ssh-agent:latest-jdk17"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/ppc64le"
      ]
    },
    "debian_jdk21": {
      "context": ".",
      "dockerfile": "debian/Dockerfile",
      "args": {
        "DEBIAN_RELEASE": "bookworm-20240423",
        "JAVA_VERSION": "21.0.3_9"
      },
      "tags": [
        "docker.io/jenkins/ssh-agent:1.2.3-jdk21",
        "docker.io/jenkins/ssh-agent:bookworm-jdk21",
        "docker.io/jenkins/ssh-agent:debian-jdk21",
        "docker.io/jenkins/ssh-agent:jdk21",
        "docker.io/jenkins/ssh-agent:latest-bookworm-jdk21",
        "docker.io/jenkins/ssh-agent:latest-debian-jdk21",
        "docker.io/jenkins/ssh-agent:latest-jdk21"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/ppc64le",
        "linux/s390x"
      ]
    },
    "debian_jdk21-preview": {
      "context": ".",
      "dockerfile": "debian/preview/Dockerfile",
      "args": {
        "DEBIAN_RELEASE": "bookworm-20240423",
        "JAVA_VERSION": "21.0.1+12"
      },
      "tags": [
        "docker.io/jenkins/ssh-agent:1.2.3-jdk21-preview",
        "docker.io/jenkins/ssh-agent:bookworm-jdk21-preview",
        "docker.io/jenkins/ssh-agent:debian-jdk21-preview",
        "docker.io/jenkins/ssh-agent:jdk21-preview",
        "docker.io/jenkins/ssh-agent:latest-bookworm-jdk21-preview",
        "docker.io/jenkins/ssh-agent:latest-debian-jdk21-preview",
        "docker.io/jenkins/ssh-agent:latest-jdk21-preview"
      ],
      "platforms": [
        "linux/arm/v7"
      ]
    }
  }
}

Submitter checklist

Edit tasklist title
Beta Give feedback Tasklist Submitter checklist, more options

Delete tasklist

Delete tasklist block?
Are you sure? All relationships in this tasklist will be removed.
  1. Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
    Options
  2. Ensure that the pull request title represents the desired changelog entry
    Options
  3. Please describe what you did
    Options
  4. Link to relevant issues in GitHub or Jira
    Options
  5. Link to relevant pull requests, esp. upstream and downstream changes
    Options
  6. Ensure you have provided tests - that demonstrates feature works or fixes the issue
    Options

@lemeurherve lemeurherve requested a review from a team as a code owner May 8, 2024 14:32
timja
timja previously approved these changes May 8, 2024
View reviewed changes
@lemeurherve lemeurherve mentioned this pull request May 8, 2024
Merged
@lemeurherve
Copy link
Member Author

Note that #401 results in the same change in fine.

@lemeurherve
Copy link
Member Author

Putting in draft until #401 is merged:

Setting the default JDK to 11 so we can introduce this pull request without any (breaking) change.

Solving #399 will then be as simple as setting this default_jdk value to 17.

Originally posted by @lemeurherve in #401 (comment)

@lemeurherve lemeurherve marked this pull request as draft May 10, 2024 16:07
@lemeurherve lemeurherve marked this pull request as ready for review May 13, 2024 07:08
@lemeurherve lemeurherve enabled auto-merge (squash) May 13, 2024 15:28
@lemeurherve lemeurherve merged commit 4875763 into jenkinsci:master May 13, 2024
9 checks passed
@lemeurherve lemeurherve deleted the jdk17-short-tags branch May 13, 2024 15:54
@lemeurherve lemeurherve mentioned this pull request May 13, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dduportal dduportal dduportal approved these changes

@timja timja timja approved these changes

Assignees
No one assigned
Labels
alpine breaking Breaking change debian jdk17
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@lemeurherve @dduportal @timja