Skip to content

Commit a8c7f6f

Browse files
committed
tasks: Use $COCKPIT_IMAGE_STORES_FILE
Introduced in cockpit-project/bots@85b0db4a0bfd5 This was the last volume mount into the home directory, so clean up the directory creation. Also drop the long-obsolete ~/.rhel directory.
1 parent e7cfcd8 commit a8c7f6f

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

tasks/Containerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ COPY cockpit-tasks install-service webhook github_handler.py /usr/local/bin/
6969
RUN groupadd -g 1111 -r user && useradd -r -g user -u 1111 user --home-dir /work && \
7070
groupadd -g 1001 -r github && useradd -r --no-create-home -g github -u 1001 github && \
7171
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 && \
7373
printf '[user]\n\t\nemail = cockpituous@cockpit-project.org\n\tname = Cockpituous\n[cockpit "bots"]\n\timages-data-dir = /cache/images\n' >/work/.gitconfig && \
7474
chmod g=u /etc/passwd && \
7575
chmod -R ugo+w /cache /work && \

tasks/install-service

+2-1
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,12 @@ ExecStart=/usr/bin/podman run --name=cockpit-tasks-%i --hostname=${CONTAINER_HOS
6363
--volume=\${TEST_CACHE}/images:/cache/images:rw \
6464
--volume=\${TEST_SECRETS}/tasks:/run/secrets/tasks:ro \
6565
--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 \
6767
--volume=/etc/npmrc:/etc/npmrc:ro \
6868
--volume=%t/podman/podman.sock:/podman.sock:rw \
6969
--env=COCKPIT_GITHUB_TOKEN_FILE=/run/secrets/webhook/.config--github-token \
7070
--env=COCKPIT_S3_KEY_DIR=/run/secrets/tasks/s3-keys \
71+
--env=COCKPIT_IMAGE_STORES_FILE=/config/image-stores \
7172
--env=TEST_JOBS=\${TEST_JOBS} \
7273
--env=TEST_NOTIFICATION_MX=\${TEST_NOTIFICATION_MX} \
7374
--env=TEST_NOTIFICATION_TO=\${TEST_NOTIFICATION_TO} \

0 commit comments

Comments
 (0)