Skip to content

Commit 524a6b1

Browse files
committed
backend, dist-git: rename dispatcher scripts
A hurdle when trying to stand-up a simple single-machine Copr deployment is that both the copr-backend and copr-dist-git packages install a script to /usr/bin/copr-run-dispatcher, preventing the user from asking that both be installed on the same system with dnf. This commit renames the script from backend and dist-git to copr-run-dispatcher-backend and copr-run-dispatcher-dist-git respectively. Fixes #3007.
1 parent 09117bf commit 524a6b1

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

backend/units/copr-backend-action.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Wants=logrotate.timer
88
Type=simple
99
User=copr
1010
Group=copr
11-
ExecStart=/usr/bin/copr-run-dispatcher actions
11+
ExecStart=/usr/bin/copr-run-dispatcher-backend actions
1212
# we don't want to kill background action processors (daemoncontext)
1313
KillMode=process
1414
Restart=on-failure

backend/units/copr-backend-build.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Wants=logrotate.timer
88
Type=simple
99
User=copr
1010
Group=copr
11-
ExecStart=/usr/bin/copr-run-dispatcher builds
11+
ExecStart=/usr/bin/copr-run-dispatcher-backend builds
1212
# we don't want to kill background action processors (daemoncontext)
1313
KillMode=process
1414
Restart=on-failure

dist-git/copr-dist-git.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Wants=logrotate.timer
88
User=copr-dist-git
99
Group=packager
1010
AmbientCapabilities=CAP_SETGID
11-
ExecStart=/usr/bin/copr-run-dispatcher imports
11+
ExecStart=/usr/bin/copr-run-dispatcher-dist-git imports
1212
KillMode=process
1313
Restart=on-failure
1414

docker-compose.dev.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ services:
1616
backend-build:
1717
environment:
1818
- PYTHONPATH=/opt/copr/backend
19-
command: /usr/sbin/runuser -u copr -g copr -- /usr/bin/copr-run-dispatcher builds
19+
command: /usr/sbin/runuser -u copr -g copr -- /usr/bin/copr-run-dispatcher-backend builds
2020

2121
backend-action:
2222
environment:
2323
- PYTHONPATH=/opt/copr/backend
24-
command: /usr/sbin/runuser -u copr -g copr -- /usr/bin/copr-run-dispatcher actions
24+
command: /usr/sbin/runuser -u copr -g copr -- /usr/bin/copr-run-dispatcher-backend actions
2525

2626
frontend:
2727
environment:

docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ services:
3434
build:
3535
context: docker/backend
3636
hostname: backend-build
37-
command: ["/run-backend", "--sign-host", "keygen-signd", "/usr/bin/copr-run-dispatcher", "builds"]
37+
command: ["/run-backend", "--sign-host", "keygen-signd", "/usr/bin/copr-run-dispatcher-backend", "builds"]
3838
depends_on:
3939
- backend-log
4040
- resalloc
@@ -48,7 +48,7 @@ services:
4848
build:
4949
context: docker/backend
5050
hostname: backend-action
51-
command: ["/run-backend", "--sign-host", "keygen-signd", "/usr/bin/copr-run-dispatcher", "actions"]
51+
command: ["/run-backend", "--sign-host", "keygen-signd", "/usr/bin/copr-run-dispatcher-backend", "actions"]
5252
depends_on:
5353
- backend-log
5454
- resalloc

docker/distgit/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ RUN directories="/etc/httpd /var/run/httpd /var/log/httpd /var/lib/dist-git /run
5454
USER copr-dist-git
5555

5656
ENTRYPOINT ["/usr/bin/tini", "--"]
57-
CMD ["bash", "-c", "mkdir -p /var/lib/dist-git/cache /var/lib/dist-git/git && exec /usr/bin/copr-run-dispatcher imports"]
57+
CMD ["bash", "-c", "mkdir -p /var/lib/dist-git/cache /var/lib/dist-git/git && exec /usr/bin/copr-run-dispatcher-dist-git imports"]

kubernetes/kustomize/backend.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ spec:
6969
- image: copr_backend-action:latest
7070
imagePullPolicy: Always
7171
name: action
72-
command: ["/tini", "--", "/usr/sbin/runuser", "-u", "copr", "-g", "copr", "--", "/usr/bin/copr-run-dispatcher", "actions"]
72+
command: ["/tini", "--", "/usr/sbin/runuser", "-u", "copr", "-g", "copr", "--", "/usr/bin/copr-run-dispatcher-dist-git", "actions"]
7373
resources:
7474
requests:
7575
cpu: 200m
@@ -86,7 +86,7 @@ spec:
8686
- image: copr_backend-build:latest
8787
imagePullPolicy: Always
8888
name: build
89-
command: ["/tini", "--", "/usr/sbin/runuser", "-u", "copr", "-g", "copr","-G", "obsrun", "--", "/usr/bin/copr-run-dispatcher", "builds"]
89+
command: ["/tini", "--", "/usr/sbin/runuser", "-u", "copr", "-g", "copr","-G", "obsrun", "--", "/usr/bin/copr-run-dispatcher-backend", "builds"]
9090
resources:
9191
requests:
9292
cpu: 200m

openshift/services/backend.yml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ spec:
138138
- name: locks
139139
mountPath: /var/lock/copr-backend
140140
command: ["/usr/bin/tini", "--"]
141-
args: ["/run-backend", "--sign-host", "copr-keygen", "/usr/bin/copr-run-dispatcher", "actions"]
141+
args: ["/run-backend", "--sign-host", "copr-keygen", "/usr/bin/copr-run-dispatcher-backend", "actions"]
142142

143143
- name: builds
144144
image: "{{ copr_backend_image }}"
@@ -156,7 +156,7 @@ spec:
156156
- name: HOME
157157
value: /backend-home
158158
command: ["/usr/bin/tini", "--"]
159-
args: ["/run-backend", "--sign-host", "copr-keygen", "/usr/bin/copr-run-dispatcher", "builds"]
159+
args: ["/run-backend", "--sign-host", "copr-keygen", "/usr/bin/copr-run-dispatcher-backend", "builds"]
160160

161161
# start these containers on the same node with copr-backend-httpd!
162162
affinity:

0 commit comments

Comments
 (0)