Skip to content

Commit 1316cd4

Browse files
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).
1 parent 03002a5 commit 1316cd4

File tree

9 files changed

+16
-16
lines changed

9 files changed

+16
-16
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ containers: tasks-container
1515
@true
1616

1717
tasks-container:
18-
$(DOCKER) build -t quay.io/cockpit/tasks:$(TAG) tasks/container
19-
$(DOCKER) tag quay.io/cockpit/tasks:$(TAG) quay.io/cockpit/tasks:latest
18+
$(DOCKER) build -t ghcr.io/cockpit-project/tasks:$(TAG) tasks/container
19+
$(DOCKER) tag ghcr.io/cockpit-project/tasks:$(TAG) ghcr.io/cockpit-project/tasks:latest
2020

2121
tasks-secrets:
2222
@cd tasks && ./build-secrets $(TASK_SECRETS)

ansible/maintenance/deploy-tasks-container.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
shell: podman rmi --all || true
1818

1919
- name: Pre-pull current container image to avoid long downtime
20-
command: podman pull quay.io/cockpit/tasks
20+
command: podman pull ghcr.io/cockpit-project/tasks
2121

2222
- name: Tell tasks containers to drain and restart
2323
command: pkill -ex cockpit-tasks
@@ -30,7 +30,7 @@
3030
shell: podman rmi --all || true
3131

3232
- name: Pre-pull current container image to avoid long downtime
33-
command: podman pull quay.io/cockpit/tasks
33+
command: podman pull ghcr.io/cockpit-project/tasks
3434

3535
- name: Restart webhook pod
3636
command: systemctl restart cockpituous-webhook.service

ansible/roles/webhook/cockpituous-webhook.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ExecStart=/usr/bin/podman run \
3333
--pull=always \
3434
-e AMQP_SERVER=localhost:5671 \
3535
-v /var/lib/cockpit-secrets/webhook:/run/secrets/webhook:ro,z \
36-
quay.io/cockpit/tasks webhook
36+
ghcr.io/cockpit-project/tasks webhook
3737

3838
ExecStop=/usr/bin/podman pod rm -f cockpituous
3939

tasks/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Without arguments this will run some purely local integration tests:
6969

7070
This will also generate the secrets in a temporary directory, unless they
7171
already exist in `tasks/credentials/`. By default this will use the
72-
[`quay.io/cockpit/tasks:latest`](https://quay.io/repository/cockpit/tasks?tab=tags)
72+
[`ghcr.io/cockpit-project/tasks:latest`](https://ghcr.io/cockpit-project/tasks)
7373
container, but you can run a different tag by setting `$TASKS_TAG`.
7474

7575
You can also test the whole GitHub → webhook → tasks → GitHub status workflow
@@ -94,7 +94,7 @@ This container can also be used for local development with
9494
development environment that's independent from the host:
9595

9696
```sh
97-
toolbox create --image quay.io/cockpit/tasks cockpit
97+
toolbox create --image ghcr.io/cockpit-project/tasks cockpit
9898
toolbox enter cockpit
9999
```
100100

@@ -122,7 +122,7 @@ container like this:
122122
```sh
123123
podman run -it --rm --device=/dev/kvm --memory=6g --pids-limit=4096 --shm-size=256m \
124124
--security-opt label=disable -v ~/.cache/cockpit-images:/cache/images \
125-
-e TEST_JOBS=2 quay.io/cockpit/tasks bash
125+
-e TEST_JOBS=2 ghcr.io/cockpit-project/tasks bash
126126
```
127127

128128
Inside, you can then run a test, for example

tasks/cockpit-tasks-centosci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
terminationGracePeriodSeconds: 3600
1717
containers:
1818
- name: cockpit-tasks
19-
image: quay.io/cockpit/tasks
19+
image: ghcr.io/cockpit-project/tasks
2020
env:
2121
# containers run as random user ID without passwd entry
2222
- name: HOME

tasks/cockpit-tasks-webhook.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
memory: 300M
3636
cpu: 200m
3737
- name: webhook
38-
image: quay.io/cockpit/tasks
38+
image: ghcr.io/cockpit-project/tasks
3939
ports:
4040
- containerPort: 8080
4141
protocol: TCP

tasks/install-service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ TimeoutStartSec=10min
4545
ExecStartPre=-/usr/bin/podman rm -f cockpit-tasks-%i
4646
# HACK: sometimes images get an MCS category which makes them undeletable by the container
4747
ExecStartPre=/usr/bin/chcon -R -l s0 ${CACHE}/images/
48-
ExecStartPre=/usr/bin/flock /tmp/cockpit-image-pull podman pull quay.io/cockpit/tasks
48+
ExecStartPre=/usr/bin/flock /tmp/cockpit-image-pull podman pull ghcr.io/cockpit-project/tasks
4949
# job-runner doesn't need /images, but we still need it for the run-queue store-tests task
5050
ExecStart=/usr/bin/podman run --name=cockpit-tasks-%i --hostname=${CONTAINER_HOSTNAME} \
5151
--volume=${CACHE}/images:/cache/images:rw \
@@ -63,7 +63,7 @@ ExecStart=/usr/bin/podman run --name=cockpit-tasks-%i --hostname=${CONTAINER_HOS
6363
6464
--env=TEST_NOTIFICATION_MX=${TEST_NOTIFICATION_MX} \
6565
--env=TEST_NOTIFICATION_TO=${TEST_NOTIFICATION_TO} \
66-
quay.io/cockpit/tasks cockpit-tasks --verbose
66+
ghcr.io/cockpit-project/tasks cockpit-tasks --verbose
6767
ExecStop=/usr/bin/podman rm -f cockpit-tasks-%i
6868
6969
[Install]

tasks/mock-github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Handler(MockHandler):
3939
"head": {"sha": "a1b2c3"},
4040
})
4141
elif self.path == f'/{repo}/{sha}/.cockpit-ci/container':
42-
self.replyData('quay.io/cockpit/tasks')
42+
self.replyData('ghcr.io/cockpit-project/tasks')
4343
else:
4444
self.send_error(404, 'Mock Not Found: ' + self.path)
4545

tasks/run-local.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ EOF
226226
--env=AMQP_SERVER=$AMQP_POD \
227227
--env=COCKPIT_GITHUB_TOKEN_FILE=/run/secrets/webhook/.config--github-token \
228228
--env=COCKPIT_GITHUB_WEBHOOK_TOKEN_FILE=/run/secrets/webhook/.config--github-webhook-token \
229-
quay.io/cockpit/tasks:${TASKS_TAG:-latest} webhook
229+
ghcr.io/cockpit-project/tasks:${TASKS_TAG:-latest} webhook
230230
fi
231231

232232
# wait until AMQP initialized
@@ -260,7 +260,7 @@ EOF
260260
--env=GIT_AUTHOR_NAME=Cockpituous \
261261
262262
--env=SKIP_STATIC_CHECK=1 \
263-
quay.io/cockpit/tasks:${TASKS_TAG:-latest} bash
263+
ghcr.io/cockpit-project/tasks:${TASKS_TAG:-latest} bash
264264

265265
# check out the correct bots, as part of what cockpit-tasks would usually do
266266
podman exec -i cockpituous-tasks sh -euc \
@@ -578,7 +578,7 @@ test_podman() {
578578
# this will be covered implicitly by job-runner, but as a more basal plumbing test this is easier to debug
579579
out="$(podman exec -i cockpituous-tasks podman-remote --url unix:///podman.sock ps)"
580580
assert_in 'cockpituous-tasks' "$out"
581-
out="$(podman exec -i cockpituous-tasks podman-remote --url unix:///podman.sock run -it --rm quay.io/cockpit/tasks:latest whoami)"
581+
out="$(podman exec -i cockpituous-tasks podman-remote --url unix:///podman.sock run -it --rm ghcr.io/cockpit-project/tasks:latest whoami)"
582582
assert_in '^user' "$out"
583583
}
584584

0 commit comments

Comments
 (0)