Skip to content

Commit 6c1b1b8

Browse files
committed
Remove docker volume for agent.
1 parent 9b36d1b commit 6c1b1b8

File tree

5 files changed

+6
-12
lines changed

5 files changed

+6
-12
lines changed

Diff for: docker-compose.yaml

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ services:
88
- ./docker/volumes/jenkins-home:/var/jenkins_home:cached
99
ports:
1010
- 8080:8080
11-
- 8000:8000
1211
- 50000:50000
1312
environment:
1413
- VIRTUAL_HOST=jenkins.local
1514
- VIRTUAL_PORT=8080
1615
- TRY_UPGRADE_IF_NO_MARKER=true
17-
- JAVA_OPTS= -Dstapler.jelly.noCache=true -Dhudson.remoting.ClassFilter=com.google.common.collect.ImmutableListMultimap -DexecutableWar.jetty.disableCustomSessionIdCookieName=true -DexecutableWar.jetty.sessionIdCookieName=killerloop
16+
- JAVA_OPTS= -Dstapler.jelly.noCache=true -Dhudson.remoting.ClassFilter=com.google.common.collect.ImmutableListMultimap -DexecutableWar.jetty.disableCustomSessionIdCookieName=true -DexecutableWar.jetty.sessionIdCookieName=killerloop
17+
user: ${CURRENT_UID}
1818
restart: always
1919
nginx-proxy:
2020
image: jwilder/nginx-proxy
@@ -28,8 +28,6 @@ services:
2828
build: ./docker/images/java-agent
2929
volumes:
3030
- ./docker/volumes/agent-data:/var/data:cached
31-
ports:
32-
- 8001:8001
3331
depends_on:
3432
- jenkins-master
3533
restart: always

Diff for: docker/images/java-agent/Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ VOLUME /var/data
1818
RUN addgroup -S jenkins && adduser -D agent -G jenkins
1919
RUN echo "agent:Docker!" | chpasswd
2020

21-
USER agent
22-
2321
RUN mkdir /home/agent/.ssh
2422
RUN chmod 700 /home/agent/.ssh
25-
COPY unsafe.pub /home/agent/.ssh/authorized_keys
23+
RUN chown agent:jenkins /home/agent/.ssh
24+
25+
COPY --chown=agent:jenkins unsafe.pub /home/agent/.ssh/authorized_keys
2626

27-
USER root
2827
COPY docker-entrypoint.sh /
2928
RUN chmod u+x docker-entrypoint.sh
3029

Diff for: docker/images/jenkins-master/plugins.txt

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ pipeline-model-extensions
5353
pipeline-rest-api
5454
pipeline-stage-step
5555
pipeline-stage-tags-metadata
56+
pitmutation
5657
plain-credentials
5758
resource-disposer
5859
scm-api

Diff for: docker/volumes/agent-data/.gitignore

-4
This file was deleted.

Diff for: docker/volumes/agent-data/AGENT_DATA_EXPORTED_BY_DOCKER

Whitespace-only changes.

0 commit comments

Comments
 (0)