Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions .github/workflows/build_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,6 @@ jobs:
cache-to: type=gha,scope=container-keyman,mode=min
load: true

- name: Build rabbitmq container
uses: docker/build-push-action@v6
with:
context: .
file: ./docker/rabbitmq/Dockerfile
build-args: |
VERSION=${{ steps.version.outputs.version }}
REVISION=${{ github.sha }}
platforms: linux/amd64
tags: ghcr.io/${{ github.repository_owner }}/collectoss-rabbitmq:test
cache-from: type=gha,scope=container-rabbitmq
cache-to: type=gha,scope=container-rabbitmq,mode=min
load: true

- name: Build backend container
uses: docker/build-push-action@v6
Expand Down Expand Up @@ -143,10 +130,6 @@ jobs:
yq eval -i '.services.keyman.pull_policy = "never"' docker-compose.yml
yq eval -i '.services.keyman.restart = "no"' docker-compose.yml

yq eval -i '.services.rabbitmq.image = "ghcr.io/${{ github.repository_owner }}/collectoss-rabbitmq:test"' docker-compose.yml
yq eval -i '.services.rabbitmq.pull_policy = "never"' docker-compose.yml
yq eval -i '.services.rabbitmq.restart = "no"' docker-compose.yml

- name: Setup Docker Compose
uses: docker/setup-compose-action@v1
with:
Expand Down Expand Up @@ -227,16 +210,6 @@ jobs:
tags: ghcr.io/${{ github.repository_owner }}/collectoss-keyman:test
layers: true

- name: Build rabbitmq container
uses: redhat-actions/buildah-build@v2
with:
context: .
containerfiles: |
./docker/rabbitmq/Dockerfile
platforms: linux/amd64
tags: ghcr.io/${{ github.repository_owner }}/collectoss-rabbitmq:test
layers: true

- name: Build backend container
uses: redhat-actions/buildah-build@v2
with:
Expand All @@ -261,10 +234,6 @@ jobs:
yq eval -i '.services.keyman.pull_policy = "never"' docker-compose.yml
yq eval -i '.services.keyman.restart = "no"' docker-compose.yml

yq eval -i '.services.rabbitmq.image = "ghcr.io/${{ github.repository_owner }}/collectoss-rabbitmq:test"' docker-compose.yml
yq eval -i '.services.rabbitmq.pull_policy = "never"' docker-compose.yml
yq eval -i '.services.rabbitmq.restart = "no"' docker-compose.yml

- name: Setup Podman Compose
uses: webgtx/setup-podman-compose@v1

Expand Down Expand Up @@ -326,8 +295,6 @@ jobs:
folder: database
- name: collectoss-keyman
folder: keyman
- name: collectoss-rabbitmq
folder: rabbitmq
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand Down
15 changes: 7 additions & 8 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,13 @@ services:
user: 3456:3456 # Run as an arbitrary non-root user

rabbitmq:
image: collectoss-rabbitmq
build:
context: .
dockerfile: ./docker/rabbitmq/Dockerfile
args:
- RABBIT_MQ_DEFAULT_USER=${COLLECTOSS_RABBITMQ_USERNAME:-augur}
- RABBIT_MQ_DEFAULT_PASSWORD=${COLLECTOSS_RABBITMQ_PASSWORD:-password123}
- RABBIT_MQ_DEFAULT_VHOST=${COLLECTOSS_RABBITMQ_VHOST:-collectoss_vhost}
image: rabbitmq:4.1-management-alpine
environment:
- RABBITMQ_DEFAULT_USER=${COLLECTOSS_RABBITMQ_USERNAME:-augur}
- RABBITMQ_DEFAULT_PASS=${COLLECTOSS_RABBITMQ_PASSWORD:-password123}
- RABBITMQ_DEFAULT_VHOST=${COLLECTOSS_RABBITMQ_VHOST:-collectoss_vhost}
volumes:
- ./docker/rabbitmq/advanced.config:/etc/rabbitmq/advanced.config:ro

core:
image: collectoss:latest
Expand Down
29 changes: 0 additions & 29 deletions docker/rabbitmq/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions docker/rabbitmq/advanced.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
[
{rabbit, [
{loopback_users, []},
{consumer_timeout, undefined}
]},
{rabbitmq_management, [
{load_definitions, "/etc/rabbitmq/definitions.json"}
]}
].
7 changes: 0 additions & 7 deletions docker/rabbitmq/collectoss.conf

This file was deleted.

30 changes: 0 additions & 30 deletions docker/rabbitmq/definitions.json

This file was deleted.

41 changes: 0 additions & 41 deletions docker/rabbitmq/update_config.py

This file was deleted.

Loading