From 370cb8f43846a6bb86bccb9e9d6f09360d7e1e13 Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 11 Mar 2024 09:07:31 +0100 Subject: [PATCH 01/14] feat(docker): First golang version. --- dockerfiles/golang/Dockerfile | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 dockerfiles/golang/Dockerfile diff --git a/dockerfiles/golang/Dockerfile b/dockerfiles/golang/Dockerfile new file mode 100644 index 00000000..de5af3e7 --- /dev/null +++ b/dockerfiles/golang/Dockerfile @@ -0,0 +1,23 @@ +FROM jenkins/ssh-agent:5.25.0 as ssh-agent + +# ca-certificates because curl will need it later on for the maven installation +RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl && apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +# Now time to install maven +ARG GOLANG_VERSION=1.21.8 +ARG TARGETARCH +ENV ARCHITECTURE=$TARGETARCH + +# Set SHELL flags for RUN commands to allow -e and pipefail +# Rationale:https://github.com/hadolint/hadolint/wiki/DL4006 +SHELL ["/bin/bash", "-eo", "pipefail", "-c"] + +RUN curl -sS -L -O --output-dir /tmp/ --create-dirs "https://go.dev/dl/go${GOLANG_VERSION}.linux-${ARCHITECTURE}.tar.gz" && \ + rm -rf /usr/local/go && tar -C /usr/local -xzf /tmp/go"$GOLANG_VERSION".linux-${ARCHITECTURE}.tar.gz && \ + rm -rf /tmp/go"$GOLANG_VERSION".linux-${ARCHITECTURE}.tar.gz + +ENV PATH=$PATH:/usr/local/go/bin + +RUN echo "PATH=${PATH}" >> /etc/environment && chown -R jenkins:jenkins "${JENKINS_AGENT_HOME}" && \ + go version From d180bca3b91b7c72a075cf3c0b8818ceb9c61c44 Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 11 Mar 2024 09:08:57 +0100 Subject: [PATCH 02/14] feat(dependencies): Tracks Gitpod full workspace docker image. --- updatecli/updatecli.d/gitpod.yaml | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 updatecli/updatecli.d/gitpod.yaml diff --git a/updatecli/updatecli.d/gitpod.yaml b/updatecli/updatecli.d/gitpod.yaml new file mode 100644 index 00000000..060686e4 --- /dev/null +++ b/updatecli/updatecli.d/gitpod.yaml @@ -0,0 +1,43 @@ +--- +name: 'deps(dockerfile): bump image "gitpod/workspace-full" digest' + +scms: + default: + kind: github + spec: + user: "{{ .github.user }}" + email: "{{ .github.email }}" + owner: "{{ .github.owner }}" + repository: "{{ .github.repository }}" + token: "{{ requiredEnv .github.token }}" + username: "{{ .github.username }}" + branch: "{{ .github.branch }}" + +sources: + gitpod/workspace-full: + name: get latest image "gitpod/workspace-full" + kind: dockerimage + spec: + image: gitpod/workspace-full + tagfilter: '\d{4}-\d{2}-\d{2}-\d{2}-\d{2}-\d{2}' + +targets: + gitpod/workspace-full: + name: 'deps(dockerfile): bump image "gitpod/workspace-full"' + kind: dockerfile + spec: + file: .gitpod/Dockerfile + instruction: + keyword: FROM + matcher: gitpod/workspace-full + sourceid: gitpod/workspace-full + +actions: + default: + kind: github/pullrequest + scmid: default + title: Bump Gitpod version to {{ source "gitpod/workspace-full" }} + spec: + labels: + - dependencies + - debian-bookworm \ No newline at end of file From 285b5e53eabfa0f060e20e32b35c07266af1e82c Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 11 Mar 2024 09:09:28 +0100 Subject: [PATCH 03/14] feat(dependencies): Added golang and an action. --- updatecli/updatecli.d/ssh-agent.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/updatecli/updatecli.d/ssh-agent.yaml b/updatecli/updatecli.d/ssh-agent.yaml index 85dd72eb..28ac65ce 100644 --- a/updatecli/updatecli.d/ssh-agent.yaml +++ b/updatecli/updatecli.d/ssh-agent.yaml @@ -23,6 +23,7 @@ sources: versionfilter: kind: semver pattern: '>=5.20.0' + targets: jenkins/python-agent: name: '[jenkins/ssh-agent] Bump Docker image tag in "dockerfiles/python/Dockerfile"' @@ -74,6 +75,16 @@ targets: matcher: jenkins/ssh-agent sourceid: jenkins/ssh-agent scmid: default + jenkins/golang-agent: + name: '[jenkins/ssh-agent] Bump Docker image tag in "dockerfiles/golang/Dockerfile"' + kind: dockerfile + spec: + file: dockerfiles/golang/Dockerfile + instruction: + keyword: FROM + matcher: jenkins/ssh-agent + sourceid: jenkins/ssh-agent + scmid: default default-agent: name: '[jenkins/ssh-agent] Bump Docker image tag in "docker-compose.yaml"' kind: yaml @@ -94,3 +105,13 @@ targets: key: $.services.default_agent.image sourceid: jenkins/ssh-agent scmid: default + +actions: + default: + kind: github/pullrequest + scmid: default + title: Bump ssh-agent version to {{ source "jenkins/ssh-agent" }} + spec: + labels: + - dependencies + - debian-bookworm \ No newline at end of file From 9e239ee86505e3a66e352c402c6e88fe84090cff Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 11 Mar 2024 09:09:51 +0100 Subject: [PATCH 04/14] chore(dependencies): Pinned version of workspace-full. --- .gitpod/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod/Dockerfile b/.gitpod/Dockerfile index 08911271..0306242b 100644 --- a/.gitpod/Dockerfile +++ b/.gitpod/Dockerfile @@ -1,7 +1,7 @@ # This Dockerfile is used to create a Gitpod workspace with GitHub CLI installed. # We start from the Gitpod full workspace image which includes a broad range of development tools. -FROM gitpod/workspace-full +FROM gitpod/workspace-full:2024-03-05-10-13-49 # The RUN command executes a series of commands in the new layer of the image and commits the results. # The following commands are executed: From 0c40f3bc7612d564547237179dd6a9534bd6c934 Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 11 Mar 2024 09:10:07 +0100 Subject: [PATCH 05/14] chore(dependencies): Added golang. --- .github/dependabot.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 645a0d2c..1825becc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -45,6 +45,11 @@ updates: open-pull-requests-limit: 10 - package-ecosystem: docker directory: "./dockerfiles/android" + schedule: + interval: weekly + open-pull-requests-limit: 10 + - package-ecosystem: docker + directory: "./dockerfiles/golang" schedule: interval: weekly open-pull-requests-limit: 10 \ No newline at end of file From 971853d97682ed6cf386e8878d6ba88d23ecd9c8 Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 11 Mar 2024 09:10:28 +0100 Subject: [PATCH 06/14] feat(dependencies): Added debian. --- updatecli/updatecli.d/debian.yaml | 46 +++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 updatecli/updatecli.d/debian.yaml diff --git a/updatecli/updatecli.d/debian.yaml b/updatecli/updatecli.d/debian.yaml new file mode 100644 index 00000000..283795f5 --- /dev/null +++ b/updatecli/updatecli.d/debian.yaml @@ -0,0 +1,46 @@ +name: 'deps(dockerfile): bump image "debian" digest' + +scms: + default: + kind: github + spec: + user: "{{ .github.user }}" + email: "{{ .github.email }}" + owner: "{{ .github.owner }}" + repository: "{{ .github.repository }}" + token: "{{ requiredEnv .github.token }}" + username: "{{ .github.username }}" + branch: "{{ .github.branch }}" + +sources: + bookwormLatestVersion: + kind: dockerimage + name: "Get the latest Debian Bookworm Linux version" + spec: + image: "debian" + tagfilter: "bookworm-*" + versionfilter: + kind: regex + pattern: >- + bookworm-\d+$ + +targets: + debian: + name: 'deps(dockerfile): bump image "debian"' + kind: dockerfile + spec: + file: dockerfiles/sidekick/Dockerfile + instruction: + keyword: FROM + matcher: debian + sourceid: bookwormLatestVersion + +actions: + default: + kind: github/pullrequest + scmid: default + title: Bump Debian Bookworm Linux version to {{ source "bookwormLatestVersion" }} + spec: + labels: + - dependencies + - debian-bookworm \ No newline at end of file From 25fffbe3cfd231d63fe567296080c2c347aed2da Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 11 Mar 2024 09:14:18 +0100 Subject: [PATCH 07/14] fix(dependencies): POSIX. --- updatecli/updatecli.d/debian.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updatecli/updatecli.d/debian.yaml b/updatecli/updatecli.d/debian.yaml index 283795f5..09f6de82 100644 --- a/updatecli/updatecli.d/debian.yaml +++ b/updatecli/updatecli.d/debian.yaml @@ -43,4 +43,4 @@ actions: spec: labels: - dependencies - - debian-bookworm \ No newline at end of file + - debian-bookworm From 72adb7f908572ef2adb8f284f38dd8d55518f7d7 Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 11 Mar 2024 09:15:47 +0100 Subject: [PATCH 08/14] fix(dependencies): POSIX. --- updatecli/updatecli.d/ssh-agent.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updatecli/updatecli.d/ssh-agent.yaml b/updatecli/updatecli.d/ssh-agent.yaml index 28ac65ce..bef372b4 100644 --- a/updatecli/updatecli.d/ssh-agent.yaml +++ b/updatecli/updatecli.d/ssh-agent.yaml @@ -114,4 +114,4 @@ actions: spec: labels: - dependencies - - debian-bookworm \ No newline at end of file + - debian-bookworm From 588573cb501265c04515eda9f4ad4878133d7799 Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 11 Mar 2024 09:49:24 +0100 Subject: [PATCH 09/14] feat(dependencies): Tracks golang version. --- updatecli/updatecli.d/golang.yaml | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 updatecli/updatecli.d/golang.yaml diff --git a/updatecli/updatecli.d/golang.yaml b/updatecli/updatecli.d/golang.yaml new file mode 100644 index 00000000..bda0699a --- /dev/null +++ b/updatecli/updatecli.d/golang.yaml @@ -0,0 +1,40 @@ +--- +name: "deps: update Golang Version" + +scms: + default: + kind: github + spec: + user: "{{ .github.user }}" + email: "{{ .github.email }}" + owner: "{{ .github.owner }}" + repository: "{{ .github.repository }}" + token: "{{ requiredEnv .github.token }}" + username: "{{ .github.username }}" + branch: "{{ .github.branch }}" + +sources: + golang: + name: Get latest Golang version + kind: golang + +targets: + golang: + name: 'deps(dockerfile): bump golang version' + kind: dockerfile + spec: + file: dockerfiles/golang/Dockerfile + instruction: + keyword: ARG + matcher: GOLANG_VERSION + sourceid: golang + +actions: + default: + kind: github/pullrequest + scmid: default + title: Bump golang version to {{ source "golang" }} + spec: + labels: + - dependencies + - chore From 67fee0f5596d2c4e3d66f906d36afaa45379b9fd Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 11 Mar 2024 10:08:54 +0100 Subject: [PATCH 10/14] fix(dependencies): "scmid: default" is mandatory. Or you won't get a PR. --- updatecli/updatecli.d/debian.yaml | 1 + updatecli/updatecli.d/gitpod.yaml | 1 + updatecli/updatecli.d/golang.yaml | 1 + updatecli/updatecli.d/maven.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/updatecli/updatecli.d/debian.yaml b/updatecli/updatecli.d/debian.yaml index 09f6de82..11a56812 100644 --- a/updatecli/updatecli.d/debian.yaml +++ b/updatecli/updatecli.d/debian.yaml @@ -27,6 +27,7 @@ sources: targets: debian: name: 'deps(dockerfile): bump image "debian"' + scmid: default kind: dockerfile spec: file: dockerfiles/sidekick/Dockerfile diff --git a/updatecli/updatecli.d/gitpod.yaml b/updatecli/updatecli.d/gitpod.yaml index 060686e4..4c728c1b 100644 --- a/updatecli/updatecli.d/gitpod.yaml +++ b/updatecli/updatecli.d/gitpod.yaml @@ -24,6 +24,7 @@ sources: targets: gitpod/workspace-full: name: 'deps(dockerfile): bump image "gitpod/workspace-full"' + scmid: default kind: dockerfile spec: file: .gitpod/Dockerfile diff --git a/updatecli/updatecli.d/golang.yaml b/updatecli/updatecli.d/golang.yaml index bda0699a..49e02ca6 100644 --- a/updatecli/updatecli.d/golang.yaml +++ b/updatecli/updatecli.d/golang.yaml @@ -21,6 +21,7 @@ sources: targets: golang: name: 'deps(dockerfile): bump golang version' + scmid: default kind: dockerfile spec: file: dockerfiles/golang/Dockerfile diff --git a/updatecli/updatecli.d/maven.yaml b/updatecli/updatecli.d/maven.yaml index 652e50d3..0c4134bc 100644 --- a/updatecli/updatecli.d/maven.yaml +++ b/updatecli/updatecli.d/maven.yaml @@ -32,6 +32,7 @@ conditions: targets: maven-agent: name: "[maven-agent] Bump maven version in dockerfiles/maven/Dockerfile" + scmid: default kind: dockerfile spec: file: dockerfiles/maven/Dockerfile From ce31e4298c77031a9e2538f8eeb490bf5ba0e1c2 Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 11 Mar 2024 10:12:43 +0100 Subject: [PATCH 11/14] fix(dependencies): mapping key "scmid" already defined at line 35 --- updatecli/updatecli.d/maven.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/updatecli/updatecli.d/maven.yaml b/updatecli/updatecli.d/maven.yaml index 0c4134bc..652e50d3 100644 --- a/updatecli/updatecli.d/maven.yaml +++ b/updatecli/updatecli.d/maven.yaml @@ -32,7 +32,6 @@ conditions: targets: maven-agent: name: "[maven-agent] Bump maven version in dockerfiles/maven/Dockerfile" - scmid: default kind: dockerfile spec: file: dockerfiles/maven/Dockerfile From d32457442a6a2e02fb3d2a00b40eb86fd1e3b8de Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 11 Mar 2024 10:15:07 +0100 Subject: [PATCH 12/14] fix(dependencies): mapping key "scmid" already defined at line 35 --- updatecli/updatecli.d/maven.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/updatecli/updatecli.d/maven.yaml b/updatecli/updatecli.d/maven.yaml index 0c4134bc..652e50d3 100644 --- a/updatecli/updatecli.d/maven.yaml +++ b/updatecli/updatecli.d/maven.yaml @@ -32,7 +32,6 @@ conditions: targets: maven-agent: name: "[maven-agent] Bump maven version in dockerfiles/maven/Dockerfile" - scmid: default kind: dockerfile spec: file: dockerfiles/maven/Dockerfile From b8bc88d79f50cedf521f9a31a56b952dc0999ac2 Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 11 Mar 2024 12:14:00 +0100 Subject: [PATCH 13/14] feat(targets): Adding golang. --- .../workflows/github-docker-registry-push.yml | 11 +++++++++- docker-compose.yaml | 22 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-docker-registry-push.yml b/.github/workflows/github-docker-registry-push.yml index 22bd2de9..4a6f5239 100755 --- a/.github/workflows/github-docker-registry-push.yml +++ b/.github/workflows/github-docker-registry-push.yml @@ -134,4 +134,13 @@ jobs: context: ./dockerfiles/android platforms: linux/amd64 push: true - tags: ghcr.io/${{ env.REPO_NAME }}/jenkinsci-tutorials:android_${{ env.BRANCH }} \ No newline at end of file + tags: ghcr.io/${{ env.REPO_NAME }}/jenkinsci-tutorials:android_${{ env.BRANCH }} + + - name: Build and push the jenkins agent for golang tutorial + if: contains(env.files, 'dockerfiles/golang/Dockerfile') + uses: docker/build-push-action@v5 + with: + context: ./dockerfiles/golang + platforms: linux/amd64, linux/arm64 + push: true + tags: ghcr.io/${{ env.REPO_NAME }}/jenkinsci-tutorials:golang_${{ env.BRANCH }} diff --git a/docker-compose.yaml b/docker-compose.yaml index 43c2c08f..71d4c10a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -168,6 +168,28 @@ services: retries: 5 volumes: - agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only + golang: + image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:golang_${BRANCH_SUFFIX} + environment: + - GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL} + container_name: desktop-jenkins_agent-1 + profiles: + - golang + depends_on: + sidekick_service: + condition: service_completed_successfully # Depends on the successful completion of the sidekick_service + jenkins_controller: + condition: service_started + ports: + - "3000:3000" + healthcheck: + test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"] + # Checks if the authorized_keys file exists in the /home/jenkins/.ssh path + interval: 5s + timeout: 10s + retries: 5 + volumes: + - agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only volumes: jenkins_home: null agent-ssh-dir: From e8f237a84dc1bc8c2d324ac86dc6afbbfb0dc0b5 Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 11 Mar 2024 12:24:59 +0100 Subject: [PATCH 14/14] fix(dependencies): Back to golang 1.21.8 so GA builds a first image. --- dockerfiles/golang/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/golang/Dockerfile b/dockerfiles/golang/Dockerfile index 5bcde49d..de5af3e7 100644 --- a/dockerfiles/golang/Dockerfile +++ b/dockerfiles/golang/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates rm -rf /var/lib/apt/lists/* # Now time to install maven -ARG GOLANG_VERSION=1.22.1 +ARG GOLANG_VERSION=1.21.8 ARG TARGETARCH ENV ARCHITECTURE=$TARGETARCH