File tree Expand file tree Collapse file tree 9 files changed +16
-16
lines changed Expand file tree Collapse file tree 9 files changed +16
-16
lines changed Original file line number Diff line number Diff line change @@ -15,8 +15,8 @@ containers: tasks-container
15
15
@true
16
16
17
17
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
20
20
21
21
tasks-secrets :
22
22
@cd tasks && ./build-secrets $(TASK_SECRETS )
Original file line number Diff line number Diff line change 17
17
shell : podman rmi --all || true
18
18
19
19
- 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
21
21
22
22
- name : Tell tasks containers to drain and restart
23
23
command : pkill -ex cockpit-tasks
30
30
shell : podman rmi --all || true
31
31
32
32
- 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
34
34
35
35
- name : Restart webhook pod
36
36
command : systemctl restart cockpituous-webhook.service
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ ExecStart=/usr/bin/podman run \
33
33
--pull =always \
34
34
-e AMQP_SERVER =localhost:5671 \
35
35
-v /var/lib/cockpit-secrets/webhook:/run/secrets/webhook:ro,z \
36
- quay .io/cockpit/tasks webhook
36
+ ghcr .io/cockpit-project /tasks webhook
37
37
38
38
ExecStop =/usr/bin/podman pod rm -f cockpituous
39
39
Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ Without arguments this will run some purely local integration tests:
69
69
70
70
This will also generate the secrets in a temporary directory, unless they
71
71
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 )
73
73
container, but you can run a different tag by setting ` $TASKS_TAG ` .
74
74
75
75
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
94
94
development environment that's independent from the host:
95
95
96
96
``` sh
97
- toolbox create --image quay .io/cockpit/tasks cockpit
97
+ toolbox create --image ghcr .io/cockpit-project /tasks cockpit
98
98
toolbox enter cockpit
99
99
```
100
100
@@ -122,7 +122,7 @@ container like this:
122
122
``` sh
123
123
podman run -it --rm --device=/dev/kvm --memory=6g --pids-limit=4096 --shm-size=256m \
124
124
--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
126
126
```
127
127
128
128
Inside, you can then run a test, for example
Original file line number Diff line number Diff line change 16
16
terminationGracePeriodSeconds : 3600
17
17
containers :
18
18
- name : cockpit-tasks
19
- image : quay .io/cockpit/tasks
19
+ image : ghcr .io/cockpit-project /tasks
20
20
env :
21
21
# containers run as random user ID without passwd entry
22
22
- name : HOME
Original file line number Diff line number Diff line change 35
35
memory : 300M
36
36
cpu : 200m
37
37
- name : webhook
38
- image : quay .io/cockpit/tasks
38
+ image : ghcr .io/cockpit-project /tasks
39
39
ports :
40
40
- containerPort : 8080
41
41
protocol : TCP
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ TimeoutStartSec=10min
45
45
ExecStartPre=-/usr/bin/podman rm -f cockpit-tasks-%i
46
46
# HACK: sometimes images get an MCS category which makes them undeletable by the container
47
47
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
49
49
# job-runner doesn't need /images, but we still need it for the run-queue store-tests task
50
50
ExecStart=/usr/bin/podman run --name=cockpit-tasks-%i --hostname=${CONTAINER_HOSTNAME} \
51
51
--volume=${CACHE} /images:/cache/images:rw \
@@ -63,7 +63,7 @@ ExecStart=/usr/bin/podman run --name=cockpit-tasks-%i --hostname=${CONTAINER_HOS
63
63
64
64
--env=TEST_NOTIFICATION_MX=${TEST_NOTIFICATION_MX} \
65
65
--env=TEST_NOTIFICATION_TO=${TEST_NOTIFICATION_TO} \
66
- quay .io/cockpit/tasks cockpit-tasks --verbose
66
+ ghcr .io/cockpit-project /tasks cockpit-tasks --verbose
67
67
ExecStop=/usr/bin/podman rm -f cockpit-tasks-%i
68
68
69
69
[Install]
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ class Handler(MockHandler):
39
39
"head" : {"sha" : "a1b2c3" },
40
40
})
41
41
elif self .path == f'/{ repo } /{ sha } /.cockpit-ci/container' :
42
- self .replyData ('quay .io/cockpit/tasks' )
42
+ self .replyData ('ghcr .io/cockpit-project /tasks' )
43
43
else :
44
44
self .send_error (404 , 'Mock Not Found: ' + self .path )
45
45
Original file line number Diff line number Diff line change 226
226
--env=AMQP_SERVER=$AMQP_POD \
227
227
--env=COCKPIT_GITHUB_TOKEN_FILE=/run/secrets/webhook/.config--github-token \
228
228
--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
230
230
fi
231
231
232
232
# wait until AMQP initialized
260
260
--env=GIT_AUTHOR_NAME=Cockpituous \
261
261
262
262
--env=SKIP_STATIC_CHECK=1 \
263
- quay .io/cockpit/tasks:${TASKS_TAG:- latest} bash
263
+ ghcr .io/cockpit-project /tasks:${TASKS_TAG:- latest} bash
264
264
265
265
# check out the correct bots, as part of what cockpit-tasks would usually do
266
266
podman exec -i cockpituous-tasks sh -euc \
@@ -578,7 +578,7 @@ test_podman() {
578
578
# this will be covered implicitly by job-runner, but as a more basal plumbing test this is easier to debug
579
579
out=" $( podman exec -i cockpituous-tasks podman-remote --url unix:///podman.sock ps) "
580
580
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) "
582
582
assert_in ' ^user' " $out "
583
583
}
584
584
You can’t perform that action at this time.
0 commit comments