Правки в k8s агент. Привел его к стандартному варианту. #58
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -1,70 +1,80 @@ | ||||||||
| # Для сборки использован стандартный шаблон jenkins-inbound-agent https://github.com/jenkinsci/docker-agent/blob/master/debian/Dockerfile | ||||||||
| # Стадию с as jre-build убрал, т.к. у нас на этот момент уже всегда есть джава в контейнере. | ||||||||
| ARG DOCKER_REGISTRY_URL | ||||||||
| ARG BASE_IMAGE | ||||||||
| ARG BASE_TAG | ||||||||
|
|
||||||||
| FROM ${DOCKER_REGISTRY_URL}/${BASE_IMAGE}:${BASE_TAG} as agent | ||||||||
|
|
||||||||
| LABEL maintainer="Nikita Gryzlov <[email protected]>, FirstBit" | ||||||||
|
|
||||||||
| ARG user=jenkins | ||||||||
| ARG group=jenkins | ||||||||
| ARG uid=1000 | ||||||||
| ARG gid=1000 | ||||||||
|
|
||||||||
| RUN groupadd -g "${gid}" "${group}" \ | ||||||||
| && useradd -l -c "Jenkins user" -d /home/"${user}" -u "${uid}" -g "${gid}" -m "${user}" || echo "user ${user} already exists." | ||||||||
|
|
||||||||
| ARG AGENT_WORKDIR=/home/"${user}"/agent | ||||||||
|
|
||||||||
| ## Always use the latest Debian packages: no need for versions | ||||||||
| # hadolint ignore=DL3008 | ||||||||
| RUN apt-get update \ | ||||||||
| && apt-get --yes --no-install-recommends install \ | ||||||||
| ca-certificates \ | ||||||||
| curl \ | ||||||||
| fontconfig \ | ||||||||
| git \ | ||||||||
| git-lfs \ | ||||||||
| less \ | ||||||||
| netbase \ | ||||||||
| openssh-client \ | ||||||||
| patch \ | ||||||||
| tzdata \ | ||||||||
| && apt-get clean \ | ||||||||
| && rm -rf /tmp/* /var/cache/* /var/lib/apt/lists/* | ||||||||
|
|
||||||||
| ARG VERSION=3283.v92c105e0f819 | ||||||||
| ADD --chown="${user}":"${group}" "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${VERSION}/remoting-${VERSION}.jar" /usr/share/jenkins/agent.jar | ||||||||
|
There was a problem hiding this comment. 🛠️ Refactor suggestion Replace Using Apply this diff to make the change: ARG VERSION=3283.v92c105e0f819
-ADD --chown="${user}":"${group}" "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${VERSION}/remoting-${VERSION}.jar" /usr/share/jenkins/agent.jar
+RUN curl -fsSL "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${VERSION}/remoting-${VERSION}.jar" -o /usr/share/jenkins/agent.jar \
+ && chown "${user}":"${group}" /usr/share/jenkins/agent.jar📝 Committable suggestion
Suggested change
|
||||||||
| RUN chmod 0644 /usr/share/jenkins/agent.jar \ | ||||||||
| && ln -sf /usr/share/jenkins/agent.jar /usr/share/jenkins/slave.jar | ||||||||
|
|
||||||||
| USER "${user}" | ||||||||
| ENV AGENT_WORKDIR=${AGENT_WORKDIR} | ||||||||
| RUN mkdir -p /home/"${user}"/.jenkins && mkdir -p "${AGENT_WORKDIR}" | ||||||||
|
|
||||||||
| VOLUME /home/"${user}"/.jenkins | ||||||||
| VOLUME "${AGENT_WORKDIR}" | ||||||||
| WORKDIR /home/"${user}" | ||||||||
| ENV USER=${user} | ||||||||
| LABEL \ | ||||||||
| org.opencontainers.image.vendor="Jenkins project" \ | ||||||||
| org.opencontainers.image.title="Official Jenkins Agent Base Docker image" \ | ||||||||
| org.opencontainers.image.description="This is a base image, which provides the Jenkins agent executable (agent.jar)" \ | ||||||||
| org.opencontainers.image.version="${VERSION}" \ | ||||||||
| org.opencontainers.image.url="https://www.jenkins.io/" \ | ||||||||
| org.opencontainers.image.source="https://github.com/jenkinsci/docker-agent" \ | ||||||||
| org.opencontainers.image.licenses="MIT" | ||||||||
|
|
||||||||
| ## Inbound Agent image target | ||||||||
| FROM agent AS inbound-agent | ||||||||
|
|
||||||||
| ARG user=jenkins | ||||||||
|
|
||||||||
| USER root | ||||||||
| COPY ./k8s-jenkins-agent/jenkins-agent /usr/local/bin/jenkins-agent | ||||||||
| RUN chmod +x /usr/local/bin/jenkins-agent &&\ | ||||||||
| ln -s /usr/local/bin/jenkins-agent /usr/local/bin/jenkins-slave | ||||||||
| # USER ${user} | ||||||||
|
There was a problem hiding this comment. Switch back to the non-root user after performing root operations For better security practices, it's advisable to switch back to the Apply this diff to uncomment the -# USER ${user}
+USER ${user}📝 Committable suggestion
Suggested change
|
||||||||
|
|
||||||||
| LABEL \ | ||||||||
| org.opencontainers.image.vendor="Jenkins project" \ | ||||||||
| org.opencontainers.image.title="Official Jenkins Inbound Agent Base Docker image" \ | ||||||||
| org.opencontainers.image.description="This is an image for Jenkins agents using TCP or WebSockets to establish inbound connection to the Jenkins controller" \ | ||||||||
| org.opencontainers.image.version="${VERSION}" \ | ||||||||
| org.opencontainers.image.url="https://www.jenkins.io/" \ | ||||||||
| org.opencontainers.image.source="https://github.com/jenkinsci/docker-agent" \ | ||||||||
| org.opencontainers.image.licenses="MIT" | ||||||||
|
|
||||||||
| ENTRYPOINT ["/usr/local/bin/jenkins-agent"] | ||||||||
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
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.
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.
🛠️ Refactor suggestion
Improve user and group creation to handle existing entities
The current
groupaddanduseraddcommands may fail if the group or user already exists, causing the build to fail. To handle existing users and groups gracefully, check if they exist before attempting to create them.Apply this diff to enhance robustness:
RUN groupadd -g "${gid}" "${group}" || true \ - && useradd -l -c "Jenkins user" -d /home/"${user}" -u "${uid}" -g "${gid}" -m "${user}" || echo "user ${user} already exists." + && id -u "${user}" &>/dev/null || useradd -l -c "Jenkins user" -d /home/"${user}" -u "${uid}" -g "${gid}" -m "${user}"📝 Committable suggestion