diff options
| -rw-r--r-- | docker/base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/base/rabbitmq_rabbitmq-server.repo | 10 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 3 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 7 |
4 files changed, 21 insertions, 8 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 9826ac765..3710a1063 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -62,7 +62,8 @@ COPY yum.conf /etc/yum.conf 'influxdb.repo', 'nfs_ganesha.repo', 'opendaylight.repo', - 'td.repo' + 'td.repo', + 'rabbitmq_rabbitmq-server.repo' ] %} {% set base_yum_repo_keys = [ @@ -327,6 +328,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences 'A20F259AEB9C94BB' ] %} {% set remote_apt_keys = [ + 'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey' ] %} {% elif base_distro == 'debian' %} {% set base_apt_keys = [ @@ -340,7 +342,8 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {% set remote_apt_keys = [ 'http://obs.linaro.org/ERP:/18.06/Debian_9/Release.key', 'https://bintray.com/user/downloadSubjectPublicKey?username=bintray', - 'https://download.docker.com/linux/debian/gpg' + 'https://download.docker.com/linux/debian/gpg', + 'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey' ] %} {% set base_apt_packages = base_apt_packages + ['sudo',] @@ -355,7 +358,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {% endif -%} {% endfor %} {% for key in remote_apt_keys | customizable('remote_apt_keys') %} - {%- if loop.first %} RUN {% else %} && {% endif %}curl {{ key }} | apt-key add - + {%- if loop.first %} RUN {% else %} && {% endif %}curl -L {{ key }} | apt-key add - {%- if not loop.last %} \ {% endif -%} {% endfor %} diff --git a/docker/base/rabbitmq_rabbitmq-server.repo b/docker/base/rabbitmq_rabbitmq-server.repo new file mode 100644 index 000000000..82d55cf84 --- /dev/null +++ b/docker/base/rabbitmq_rabbitmq-server.repo @@ -0,0 +1,10 @@ +[rabbitmq_rabbitmq-server] +name=rabbitmq_rabbitmq-server +baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/7/$basearch +repo_gpgcheck=1 +gpgcheck=0 +enabled=1 +gpgkey=https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey +sslverify=1 +sslcacert=/etc/pki/tls/certs/ca-bundle.crt +metadata_expire=300 diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index ce5919edb..3c5229ba8 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -32,3 +32,6 @@ deb https://sensu.global.ssl.fastly.net/apt bionic main # Opendaylight repo deb http://ppa.launchpad.net/odl-team/carbon/ubuntu xenial main + +# rabbitmq repo +deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ xenial main diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index b737941b6..6326f108e 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -27,7 +27,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% else %} {% set rabbitmq_packages = rabbitmq_packages + [ - 'https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb', + 'rabbitmq-server', ] %} {% endif %} @@ -51,11 +51,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block rabbitmq_install_plugins %} RUN rm -rf /var/lib/rabbitmq/* \ - && ln -s /usr/lib/rabbitmq/lib/rabbitmq_server-3.6.* /usr/lib/rabbitmq/lib/rabbitmq_server-3.6 \ - && curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.6/plugins/rabbitmq_clusterer-3.6.x-667f92b0.ez https://www.rabbitmq.com/community-plugins/v3.6.x/rabbitmq_clusterer-3.6.x-667f92b0.ez \ && /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline \ - rabbitmq_management \ - rabbitmq_clusterer + rabbitmq_management {% endblock %} |