From 37c623fa0235d1cff18590124d7ada450886f9c9 Mon Sep 17 00:00:00 2001 From: gounthar Date: Fri, 24 Nov 2023 22:53:27 +0100 Subject: [PATCH 1/2] fix(updatecli): updatecli without manifests produced those changes. --- build-docker-compose.yaml | 79 +++++++++++++++++------------------ dockerfiles/python/Dockerfile | 2 +- 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/build-docker-compose.yaml b/build-docker-compose.yaml index 96c436cc..68aa8cd2 100644 --- a/build-docker-compose.yaml +++ b/build-docker-compose.yaml @@ -4,48 +4,48 @@ services: build: dockerfiles/sidekick/. stdin_open: true tty: true - entrypoint: sh -c "/usr/local/bin/keygen.sh /ssh-dir" # Runs the keygen.sh script and specifies the output directory + entrypoint: sh -c "/usr/local/bin/keygen.sh /ssh-dir" # Runs the keygen.sh script and specifies the output directory volumes: - - agent-ssh-dir:/ssh-dir # Mounts the agent-ssh-dir volume to the /ssh-dir path inside the container + - agent-ssh-dir:/ssh-dir # Mounts the agent-ssh-dir volume to the /ssh-dir path inside the container healthcheck: - test: [ "CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1" ] # Checks if the conductor_ok file exists in the /ssh-dir path + test: ["CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1"] + # Checks if the conductor_ok file exists in the /ssh-dir path interval: 5s timeout: 10s retries: 5 - jenkins_controller: build: dockerfiles/. restart: on-failure ports: - "8080:8080" volumes: - - jenkins_home:/var/jenkins_home # Mounts the jenkins_home volume to the /var/jenkins_home path inside the container - - agent-ssh-dir:/ssh-dir # Mounts the agent-ssh-dir volume to the /app path inside the container + - jenkins_home:/var/jenkins_home # Mounts the jenkins_home volume to the /var/jenkins_home path inside the container + - agent-ssh-dir:/ssh-dir # Mounts the agent-ssh-dir volume to the /app path inside the container depends_on: sidekick_service: - condition: service_completed_successfully # Depends on the successful completion of the sidekick_service + condition: service_completed_successfully # Depends on the successful completion of the sidekick_service healthcheck: - test: [ "CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1" ] # Checks if the conductor_ok file exists in the /ssh-dir path + test: ["CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1"] + # Checks if the conductor_ok file exists in the /ssh-dir path interval: 5s timeout: 10s retries: 5 - default_agent: - image: jenkins/ssh-agent:5.5.0-jdk17 + image: jenkins/ssh-agent:5.20.0 container_name: desktop-jenkins_agent-1 depends_on: sidekick_service: - condition: service_completed_successfully # Depends on the successful completion of the sidekick_service + condition: service_completed_successfully # Depends on the successful completion of the sidekick_service jenkins_controller: - condition: service_started + condition: service_started 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 + 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 - + - 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 maven: build: dockerfiles/maven/. container_name: desktop-jenkins_agent-1 @@ -53,17 +53,17 @@ services: - maven depends_on: sidekick_service: - condition: service_completed_successfully # Depends on the successful completion of the sidekick_service + condition: service_completed_successfully # Depends on the successful completion of the sidekick_service jenkins_controller: - condition: service_started + condition: service_started 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 + 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 - + - 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 python: build: dockerfiles/python/. container_name: desktop-jenkins_agent-1 @@ -71,64 +71,63 @@ services: - python depends_on: sidekick_service: - condition: service_completed_successfully # Depends on the successful completion of the sidekick_service + condition: service_completed_successfully # Depends on the successful completion of the sidekick_service jenkins_controller: - condition: service_started + condition: service_started 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 + 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 - + - 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 node: build: dockerfiles/node/. environment: - - GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL} + - GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL} container_name: desktop-jenkins_agent-1 profiles: - node depends_on: sidekick_service: - condition: service_completed_successfully # Depends on the successful completion of the sidekick_service + condition: service_completed_successfully # Depends on the successful completion of the sidekick_service jenkins_controller: - condition: service_started + 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 + 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 - + - 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 multi: build: dockerfiles/multi/. environment: - - GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL} + - GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL} container_name: desktop-jenkins_agent-1 profiles: - multi depends_on: sidekick_service: - condition: service_completed_successfully # Depends on the successful completion of the sidekick_service + condition: service_completed_successfully # Depends on the successful completion of the sidekick_service jenkins_controller: - condition: service_started + condition: service_started ports: - "3000:3000" - "5000:5000" 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 + 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 - - + - 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: + jenkins_home: null agent-ssh-dir: - name: agent-ssh-dir # Creates a named volume called agent-ssh-dir + name: agent-ssh-dir # Creates a named volume called agent-ssh-dir diff --git a/dockerfiles/python/Dockerfile b/dockerfiles/python/Dockerfile index a4320ba6..000e1eff 100644 --- a/dockerfiles/python/Dockerfile +++ b/dockerfiles/python/Dockerfile @@ -30,4 +30,4 @@ RUN echo "PATH=${PATH}" >> /etc/environment # Set the ownership of the Jenkins agent home directory to the Jenkins user. # This ensures that the Jenkins user has the necessary permissions to access its home directory. -RUN chown -R jenkins:jenkins "${JENKINS_AGENT_HOME}" \ No newline at end of file +RUN chown -R jenkins:jenkins "${JENKINS_AGENT_HOME}" From 0d586cfa1326c0d8d8f3d9b3564b948df2db48ef Mon Sep 17 00:00:00 2001 From: gounthar Date: Sat, 25 Nov 2023 19:28:27 +0100 Subject: [PATCH 2/2] chore(docker): New node LTS. --- dockerfiles/node/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/node/Dockerfile b/dockerfiles/node/Dockerfile index 8b12d3f6..f566cfa4 100644 --- a/dockerfiles/node/Dockerfile +++ b/dockerfiles/node/Dockerfile @@ -1,5 +1,5 @@ FROM jenkins/ssh-agent:5.20.0 as ssh-agent -ARG NODE_MAJOR=18 +ARG NODE_MAJOR=20 # ca-certificates because curl will need it later on for the node installation RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl gnupg && \