diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 907ce08..3663817 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -7,16 +7,10 @@ RUN apt-get install -y --no-install-recommends \ RUN rm -rf /var/lib/rabbitmq/* -COPY rabbitmq.config /etc/rabbitmq/ -COPY start.sh /usr/local/bin/start.sh COPY rabbitmq_sudoers /etc/sudoers.d/rabbitmq_sudoers -RUN chmod 755 /usr/local/bin/start.sh \ - && chmod 750 /etc/sudoers.d \ +RUN chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/rabbitmq_sudoers \ - && usermod -a -G microservices rabbitmq - -ENV RABBITMQ_CLUSTER_COOKIE "password" + && usermod -a -G microservices rabbitmq \ + && chown -R rabbitmq: /var/lib/rabbitmq /var/log/rabbitmq /etc/rabbitmq USER rabbitmq - -CMD ["start.sh"] diff --git a/docker/rabbitmq/rabbitmq.config b/docker/rabbitmq/rabbitmq.config deleted file mode 100644 index c9d2228..0000000 --- a/docker/rabbitmq/rabbitmq.config +++ /dev/null @@ -1,11 +0,0 @@ -[ - {rabbit, [ - {tcp_listeners, [ - {"IPADDR", 5672} - ]}, - {default_user, <<"rabbitmq">>}, - {default_pass, <<"RABBITMQ_CLUSTER_COOKIE">>}, - {cluster_partition_handling, autoheal} - ]} -]. -% EOF diff --git a/docker/rabbitmq/start.sh b/docker/rabbitmq/start.sh deleted file mode 100644 index f234ebd..0000000 --- a/docker/rabbitmq/start.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# bootstrap -sudo chown -R rabbitmq: /var/lib/rabbitmq -sudo chown -R rabbitmq: /etc/rabbitmq -echo "${RABBITMQ_CLUSTER_COOKIE}" > /var/lib/rabbitmq/.erlang.cookie -chmod 400 /var/lib/rabbitmq/.erlang.cookie - -# delme in future -sed -i "s/IPADDR_COMMAS/`hostname -i | sed 's/\./,/g'`/g" /etc/rabbitmq/rabbitmq.config -sed -i "s/IPADDR/`hostname -i`/g" /etc/rabbitmq/rabbitmq.config -sed -i "s/RABBITMQ_CLUSTER_COOKIE/$RABBITMQ_CLUSTER_COOKIE/g" /etc/rabbitmq/rabbitmq.config - -# run daemon -rabbitmq-server diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml new file mode 100644 index 0000000..b555f81 --- /dev/null +++ b/service/files/defaults.yaml @@ -0,0 +1,4 @@ +configs: + rabbitmq_port: 5672 + rabbitmq_password: password + rabbitmq_user: rabbitmq diff --git a/service/files/erlang.cookie b/service/files/erlang.cookie new file mode 100644 index 0000000..5dc245f --- /dev/null +++ b/service/files/erlang.cookie @@ -0,0 +1 @@ +{{ rabbitmq_password }} diff --git a/service/files/rabbitmq.config.j2 b/service/files/rabbitmq.config.j2 new file mode 100644 index 0000000..b166f6c --- /dev/null +++ b/service/files/rabbitmq.config.j2 @@ -0,0 +1,11 @@ +[ + {rabbit, [ + {tcp_listeners, [ + {"0.0.0.0", {{ rabbitmq_port }} } + ]}, + {default_user, <<"{{ rabbitmq_user }}">>}, + {default_pass, <<"{{ rabbitmq_password }}">>}, + {cluster_partition_handling, autoheal} + ]} +]. +% EOF diff --git a/service/rabbitmq.yaml b/service/rabbitmq.yaml new file mode 100644 index 0000000..04aaf18 --- /dev/null +++ b/service/rabbitmq.yaml @@ -0,0 +1,20 @@ +service: + name: rabbitmq + ports: + - rabbitmq_port + probes: + readiness: "true" + liveness: "true" + daemon: + files: + - rabbitmq-conf + - erlang-cookie + command: rabbitmq-server +files: + rabbitmq-conf: + path: /etc/rabbitmq/rabbitmq.config + content: rabbitmq.config.j2 + erlang-cookie: + path: /var/lib/rabbitmq/.erlang.cookie + content: erlang.cookie + perm: "400"