From 12f54db5cf6d5d1216df6cd83a4ebf2e3f523fc6 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 19 Jan 2024 23:11:10 +0100 Subject: [PATCH] [bitnami/jenkins-agent] Release 0.3206.0-debian-11-r1 (#55014) Signed-off-by: Bitnami Containers --- bitnami/jenkins-agent/0/debian-11/Dockerfile | 7 ++- .../0/debian-11/docker-compose.yml | 7 --- .../opt/bitnami/.bitnami_components.json | 2 +- bitnami/jenkins-agent/README.md | 60 ++++++++----------- 4 files changed, 31 insertions(+), 45 deletions(-) delete mode 100644 bitnami/jenkins-agent/0/debian-11/docker-compose.yml diff --git a/bitnami/jenkins-agent/0/debian-11/Dockerfile b/bitnami/jenkins-agent/0/debian-11/Dockerfile index 27ea78f42362..c61ad6e1aa56 100644 --- a/bitnami/jenkins-agent/0/debian-11/Dockerfile +++ b/bitnami/jenkins-agent/0/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2024-01-09T19:58:39Z" \ + org.opencontainers.image.created="2024-01-19T21:04:30Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.3206.0-debian-11-r0" \ + org.opencontainers.image.ref.name="0.3206.0-debian-11-r1" \ org.opencontainers.image.title="jenkins-agent" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.3206.0" @@ -27,7 +27,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "java-17.0.10-13-0-linux-${OS_ARCH}-debian-11" \ "jenkins-agent-0.3206.0-0-linux-${OS_ARCH}-debian-11" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -42,6 +42,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami +RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh diff --git a/bitnami/jenkins-agent/0/debian-11/docker-compose.yml b/bitnami/jenkins-agent/0/debian-11/docker-compose.yml deleted file mode 100644 index a0215bfb6e22..000000000000 --- a/bitnami/jenkins-agent/0/debian-11/docker-compose.yml +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -version: '2' -services: - jenkins-agent: - image: docker.io/bitnami/jenkins-agent:0 diff --git a/bitnami/jenkins-agent/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jenkins-agent/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9d671e98a669..0fcdab27e4c1 100644 --- a/bitnami/jenkins-agent/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jenkins-agent/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.9-11-6" + "version": "17.0.10-13-0" }, "jenkins-agent": { "arch": "amd64", diff --git a/bitnami/jenkins-agent/README.md b/bitnami/jenkins-agent/README.md index 18fdb63ca358..56ced53c21ec 100644 --- a/bitnami/jenkins-agent/README.md +++ b/bitnami/jenkins-agent/README.md @@ -64,17 +64,28 @@ docker build -t bitnami/APP:latest . ### Environment variables -When you start the Jenkins Agent image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the `docker run` command line. If you want to add a new environment variable: +#### Customizable environment variables -* For docker-compose add the variable name and value under the application section in the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/jenkins/docker-compose.yml) file present in this repository: +| Name | Description | Default Value | +|----------------------------|------------------------------------------------------------------------------------|------------------------------------| +| `JENKINS_AGENT_WORKDIR` | The working directory of the remoting instance (stores cache and logs by default). | `${JENKINS_AGENT_VOLUME_DIR}/home` | +| `JENKINS_AGENT_WEB_SOCKET` | Make a WebSocket connection to Jenkins rather than using the TCP port | `false` | +| `JAVA_HOME` | Java Home directory. | `${BITNAMI_ROOT_DIR}/java` | - ```yaml - jenkins-agent: - ... - environment: - - JENKINS_URL=http://jenkins:port - ... - ``` +#### Read-only environment variables + +| Name | Description | Value | +|------------------------------|------------------------------------------------------|-----------------------------------------------| +| `JENKINS_AGENT_BASE_DIR` | Jenkins Agent installation directory. | `${BITNAMI_ROOT_DIR}/jenkins-agent` | +| `JENKINS_AGENT_LOGS_DIR` | Jenkins Agent directory for log files. | `${JENKINS_AGENT_BASE_DIR}/logs` | +| `JENKINS_AGENT_LOG_FILE` | Path to the Jenkins Agent log file. | `${JENKINS_AGENT_LOGS_DIR}/jenkins-agent.log` | +| `JENKINS_AGENT_TMP_DIR` | Jenkins Agent directory for runtime temporary files. | `${JENKINS_AGENT_BASE_DIR}/tmp` | +| `JENKINS_AGENT_PID_FILE` | Path to the Jenkins Agent PID file. | `${JENKINS_AGENT_TMP_DIR}/jenkins-agent.pid` | +| `JENKINS_AGENT_VOLUME_DIR` | Persistence base directory. | `${BITNAMI_VOLUME_DIR}/jenkins` | +| `JENKINS_AGENT_DAEMON_USER` | Jenkins Agent system user. | `jenkins` | +| `JENKINS_AGENT_DAEMON_GROUP` | Jenkins Agent system group. | `jenkins` | + +When you start the Jenkins Agent image, you can adjust the configuration of the instance by passing one or more environment variables either on the `docker run` command line. If you want to add a new environment variable: * For manual execution add a `--env` option with each variable and value: @@ -84,25 +95,6 @@ When you start the Jenkins Agent image, you can adjust the configuration of the bitnami/jenkins-agent:latest ``` -Available environment variables: - -#### User and Site configuration - -* `JENKINS_AGENT_WORKDIR`: The working directory of the remoting instance (stores cache and logs by default). Default: **/bitnami/jenkins/home** -* `JENKINS_URL`: Specify the Jenkins root URLs to connect to. -* `JENKINS_AGENT_TUNNEL`: Connect to the specified host and port, instead of connecting directly to Jenkins. Useful when connection to Jenkins needs to be tunneled. -* `JENKINS_AGENT_PROTOCOLS`: Specify the remoting protocols to attempt when instanceIdentity is provided. -* `JENKINS_AGENT_DIRECT_CONNECTION`: Connect directly to this TCP agent port, skipping the HTTP(S) connection. -* `JENKINS_AGENT_INSTANCE_IDENTITY`: The base64 encoded InstanceIdentity byte array of the Jenkins controller. -* `JENKINS_AGENT_WEB_SOCKET`: Make a WebSocket connection to Jenkins rather than using the TCP port. Default: **false** -* `JENKINS_AGENT_SECRET`: Jenkins Agent name. -* `JENKINS_AGENT_NAME`: Jenkins Agent secret. - -##### JAVA configuration - -* `JAVA_OPTS`: Customize JVM parameters. No defaults. -* `JAVA_HOME`: Java Home directory. Default: **/opt/bitnami/java** - ## Logging The Bitnami Jenkins Agent Docker image sends the container logs to `stdout`. To view the logs: @@ -111,12 +103,6 @@ The Bitnami Jenkins Agent Docker image sends the container logs to `stdout`. To docker logs jenkins ``` -Or using Docker Compose: - -```console -docker-compose logs jenkins -``` - You can configure the containers [logging driver](https://docs.docker.com/engine/admin/logging/overview/) using the `--log-driver` option if you wish to consume the container logs differently. In the default configuration docker uses the `json-file` driver. ## Maintenance @@ -135,6 +121,12 @@ FROM bitnami/jenkins-agent ... ``` +## Notable Changes + +### Starting January 16, 2024 + +* The `docker-compose.yaml` file has been removed, as it was solely intended for internal testing purposes. + ## Contributing We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues) or submitting a [pull request](https://github.com/bitnami/containers/pulls) with your contribution.