-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
various: update references to tasks container image
The tasks container is now on ghcr.io, not quay.io. Update everything that refers to it. This was mostly a sed patch (with exceptions for related URLs in docs).
- Loading branch information
1 parent
03002a5
commit 1316cd4
Showing
9 changed files
with
16 additions
and
16 deletions.
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
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
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
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
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
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
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 |
---|---|---|
|
@@ -45,7 +45,7 @@ TimeoutStartSec=10min | |
ExecStartPre=-/usr/bin/podman rm -f cockpit-tasks-%i | ||
# HACK: sometimes images get an MCS category which makes them undeletable by the container | ||
ExecStartPre=/usr/bin/chcon -R -l s0 ${CACHE}/images/ | ||
ExecStartPre=/usr/bin/flock /tmp/cockpit-image-pull podman pull quay.io/cockpit/tasks | ||
ExecStartPre=/usr/bin/flock /tmp/cockpit-image-pull podman pull ghcr.io/cockpit-project/tasks | ||
# job-runner doesn't need /images, but we still need it for the run-queue store-tests task | ||
ExecStart=/usr/bin/podman run --name=cockpit-tasks-%i --hostname=${CONTAINER_HOSTNAME} \ | ||
--volume=${CACHE}/images:/cache/images:rw \ | ||
|
@@ -63,7 +63,7 @@ ExecStart=/usr/bin/podman run --name=cockpit-tasks-%i --hostname=${CONTAINER_HOS | |
[email protected] \ | ||
--env=TEST_NOTIFICATION_MX=${TEST_NOTIFICATION_MX} \ | ||
--env=TEST_NOTIFICATION_TO=${TEST_NOTIFICATION_TO} \ | ||
quay.io/cockpit/tasks cockpit-tasks --verbose | ||
ghcr.io/cockpit-project/tasks cockpit-tasks --verbose | ||
ExecStop=/usr/bin/podman rm -f cockpit-tasks-%i | ||
[Install] | ||
|
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
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 |
---|---|---|
|
@@ -226,7 +226,7 @@ EOF | |
--env=AMQP_SERVER=$AMQP_POD \ | ||
--env=COCKPIT_GITHUB_TOKEN_FILE=/run/secrets/webhook/.config--github-token \ | ||
--env=COCKPIT_GITHUB_WEBHOOK_TOKEN_FILE=/run/secrets/webhook/.config--github-webhook-token \ | ||
quay.io/cockpit/tasks:${TASKS_TAG:-latest} webhook | ||
ghcr.io/cockpit-project/tasks:${TASKS_TAG:-latest} webhook | ||
fi | ||
|
||
# wait until AMQP initialized | ||
|
@@ -260,7 +260,7 @@ EOF | |
--env=GIT_AUTHOR_NAME=Cockpituous \ | ||
[email protected] \ | ||
--env=SKIP_STATIC_CHECK=1 \ | ||
quay.io/cockpit/tasks:${TASKS_TAG:-latest} bash | ||
ghcr.io/cockpit-project/tasks:${TASKS_TAG:-latest} bash | ||
|
||
# check out the correct bots, as part of what cockpit-tasks would usually do | ||
podman exec -i cockpituous-tasks sh -euc \ | ||
|
@@ -578,7 +578,7 @@ test_podman() { | |
# this will be covered implicitly by job-runner, but as a more basal plumbing test this is easier to debug | ||
out="$(podman exec -i cockpituous-tasks podman-remote --url unix:///podman.sock ps)" | ||
assert_in 'cockpituous-tasks' "$out" | ||
out="$(podman exec -i cockpituous-tasks podman-remote --url unix:///podman.sock run -it --rm quay.io/cockpit/tasks:latest whoami)" | ||
out="$(podman exec -i cockpituous-tasks podman-remote --url unix:///podman.sock run -it --rm ghcr.io/cockpit-project/tasks:latest whoami)" | ||
assert_in '^user' "$out" | ||
} | ||
|
||
|