From 5df8109286e30076855e53ca4f8b1603e10ba9b7 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 3 Jul 2020 15:30:13 +0200 Subject: Use latest Erlang 20/21 Signed-off-by: Peter Lemenkov --- docker/centos_20/Dockerfile | 5 +---- docker/centos_21/Dockerfile | 7 +------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/docker/centos_20/Dockerfile b/docker/centos_20/Dockerfile index 77dd927..e9b2294 100644 --- a/docker/centos_20/Dockerfile +++ b/docker/centos_20/Dockerfile @@ -13,10 +13,7 @@ RUN yum install -y \ nano \ rpm-build - -RUN wget https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/20/el/7/x86_64/erlang-20.3.8.15-1.el7.centos.x86_64.rpm - -RUN rpm -i erlang-20.3.8.15-1.el7.centos.x86_64.rpm +RUN yum install -y https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/20/el/7/x86_64/erlang-20.3.8.26-1.el7.x86_64.rpm RUN wget https://github.com/rebar/rebar/wiki/rebar && chmod +x rebar diff --git a/docker/centos_21/Dockerfile b/docker/centos_21/Dockerfile index ec43fff..6511c0d 100644 --- a/docker/centos_21/Dockerfile +++ b/docker/centos_21/Dockerfile @@ -12,11 +12,6 @@ RUN yum install -y \ epel-release \ nano - - - -RUN wget https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/21/el/7/x86_64/erlang-21.1.2-1.el7.centos.x86_64.rpm - -RUN rpm -i erlang-21.1.2-1.el7.centos.x86_64.rpm +RUN yum install -y https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/21/el/7/x86_64/erlang-21.3.8.16-1.el7.x86_64.rpm RUN wget https://github.com/rebar/rebar/wiki/rebar && chmod +x rebar -- cgit v1.2.1 From d5f6262dd7927b3a5f33e2eab385cb14685fc752 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 3 Jul 2020 15:35:28 +0200 Subject: whitespace Signed-off-by: Peter Lemenkov --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7a2c6ec..2a06a99 100644 --- a/Makefile +++ b/Makefile @@ -20,5 +20,5 @@ dialyzer: deb: cd packaging/deb && $(MAKE) TOPDIR=$(PWD) deb -rpm: +rpm: cd packaging/centos && $(MAKE) TOPDIR=$(PWD) rpm -- cgit v1.2.1