Commit a8c7f6f 1 parent e7cfcd8 commit a8c7f6f Copy full SHA for a8c7f6f
File tree 2 files changed +3
-2
lines changed
2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ COPY cockpit-tasks install-service webhook github_handler.py /usr/local/bin/
69
69
RUN groupadd -g 1111 -r user && useradd -r -g user -u 1111 user --home-dir /work && \
70
70
groupadd -g 1001 -r github && useradd -r --no-create-home -g github -u 1001 github && \
71
71
mkdir -p /usr/local/bin /cache/images /cache/github && \
72
- mkdir -p /work/.config /work/.config/cockpit-dev /work/. ssh /work/.cache /work/.rhel && \
72
+ mkdir -p /work/.ssh /work/.cache && \
73
73
printf '[user]\n\t\n email = cockpituous@cockpit-project.org\n\t name = Cockpituous\n [cockpit "bots"]\n\t images-data-dir = /cache/images\n ' >/work/.gitconfig && \
74
74
chmod g=u /etc/passwd && \
75
75
chmod -R ugo+w /cache /work && \
Original file line number Diff line number Diff line change @@ -63,11 +63,12 @@ ExecStart=/usr/bin/podman run --name=cockpit-tasks-%i --hostname=${CONTAINER_HOS
63
63
--volume=\$ {TEST_CACHE}/images:/cache/images:rw \
64
64
--volume=\$ {TEST_SECRETS}/tasks:/run/secrets/tasks:ro \
65
65
--volume=\$ {TEST_SECRETS}/webhook:/run/secrets/webhook:ro \
66
- --volume=${IMAGE_STORES} :/work/. config/cockpit-dev /image-stores:ro \
66
+ --volume=${IMAGE_STORES} :/config/image-stores:ro \
67
67
--volume=/etc/npmrc:/etc/npmrc:ro \
68
68
--volume=%t/podman/podman.sock:/podman.sock:rw \
69
69
--env=COCKPIT_GITHUB_TOKEN_FILE=/run/secrets/webhook/.config--github-token \
70
70
--env=COCKPIT_S3_KEY_DIR=/run/secrets/tasks/s3-keys \
71
+ --env=COCKPIT_IMAGE_STORES_FILE=/config/image-stores \
71
72
--env=TEST_JOBS=\$ {TEST_JOBS} \
72
73
--env=TEST_NOTIFICATION_MX=\$ {TEST_NOTIFICATION_MX} \
73
74
--env=TEST_NOTIFICATION_TO=\$ {TEST_NOTIFICATION_TO} \
You can’t perform that action at this time.
0 commit comments