Skip to content

Commit bb77739

Browse files
committed
docker-compose: use rabbitmq instead of activemq
This makes the use of rabbitmq consistent across the dev environment and the CI. Signed-off-by: Hank Donnay <[email protected]>
1 parent 1267335 commit bb77739

File tree

2 files changed

+38
-5
lines changed

2 files changed

+38
-5
lines changed

docker-compose.yaml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ x-anchors:
1313
redis: &redis-image docker.io/library/redis:6.2
1414
go: &go-image quay.io/projectquay/golang:1.20
1515
skopeo: &skopeo-image quay.io/skopeo/stable:latest
16-
activemq: &activemq-image docker.io/rmohr/activemq:5.15.9-alpine
16+
rabbitmq: &rabbitmq-image docker.io/library/rabbitmq:3.11
1717
clair-service: &clair-service
1818
image: *go-image
1919
depends_on:
@@ -147,13 +147,20 @@ services:
147147
- -D
148148
- -key
149149
- c2VjcmV0
150-
activemq:
150+
rabbitmq:
151151
# This provides STOMP and AMQP on the usual ports.
152-
# The web UI is broken; help wanted.
153-
container_name: clair-activemq
152+
# The web UI is available on /rabbitmq
153+
container_name: clair-rabbitmq
154154
profiles:
155155
- notifier
156-
image: *activemq-image
156+
image: *rabbitmq-image
157+
command:
158+
- sh
159+
- -c
160+
- |
161+
set -e
162+
rabbitmq-plugins enable rabbitmq_stomp rabbitmq_management >/dev/null
163+
exec rabbitmq-server
157164
158165
# Quay -- starts a Quay stack for integration testing.
159166
# Use profile 'quay'
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
http:
3+
routers:
4+
rabbitmq:
5+
entryPoints: [traefik]
6+
rule: 'PathPrefix(`/rabbitmq`)'
7+
middlewares:
8+
- rewrite-api
9+
- rewrite
10+
service: rabbitmq
11+
services:
12+
rabbitmq:
13+
loadBalancer:
14+
servers:
15+
- url: "http://clair-rabbitmq:15672/"
16+
healthCheck:
17+
path: /
18+
middlewares:
19+
rewrite-api:
20+
replacePathRegex:
21+
regex: '^/rabbitmq/api/(.*?)/(.*)'
22+
replacement: '/api/%2F/$2'
23+
rewrite:
24+
replacePathRegex:
25+
regex: '^/rabbitmq/(.*)$'
26+
replacement: '/$1'

0 commit comments

Comments
 (0)