From f198941043291eb2853150fb544abff59ce5a4eb Mon Sep 17 00:00:00 2001 From: getong Date: Fri, 27 Jul 2018 20:07:42 +0800 Subject: use ubuntu 16.04, update erlang version --- docker/ubuntu_18_3/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/ubuntu_18_3/Dockerfile b/docker/ubuntu_18_3/Dockerfile index 52d91a7..866deb8 100644 --- a/docker/ubuntu_18_3/Dockerfile +++ b/docker/ubuntu_18_3/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu +FROM ubuntu:16.04 RUN apt-get -y update @@ -7,7 +7,7 @@ RUN apt-get install -y \ make \ git \ wget \ - erlang=1:18.3-dfsg-1ubuntu3 \ + erlang=1:18.3-dfsg-1ubuntu3.1 \ build-essential \ devscripts \ fakeroot \ -- cgit v1.2.1 From 9073fe570fdcaa56e669423202ca025bda315089 Mon Sep 17 00:00:00 2001 From: getong Date: Fri, 27 Jul 2018 20:08:43 +0800 Subject: rename dir 19 to 19.3 --- docker/centos_19.3/Dockerfile | 50 +++++++++++++++++++++++++++++++++ docker/centos_19/Dockerfile | 28 ------------------- docker/ubuntu_19.3/Dockerfile | 65 +++++++++++++++++++++++++++++++++++++++++++ docker/ubuntu_19/Dockerfile | 23 --------------- 4 files changed, 115 insertions(+), 51 deletions(-) create mode 100644 docker/centos_19.3/Dockerfile delete mode 100644 docker/centos_19/Dockerfile create mode 100644 docker/ubuntu_19.3/Dockerfile delete mode 100644 docker/ubuntu_19/Dockerfile diff --git a/docker/centos_19.3/Dockerfile b/docker/centos_19.3/Dockerfile new file mode 100644 index 0000000..c4cdf37 --- /dev/null +++ b/docker/centos_19.3/Dockerfile @@ -0,0 +1,50 @@ +FROM centos + +RUN yum -y update + +RUN yum install -y \ + gcc \ + systemd-devel \ + make \ + git \ + wget \ + which \ + epel-release \ + nano + + +RUN wget https://packages.erlang-solutions.com/erlang-solutions-1.0-1.noarch.rpm + +RUN rpm -Uvh erlang-solutions-1.0-1.noarch.rpm + +RUN yum update -y + +RUN yum install -y erlang-erts-19.3-1.el7.centos \ + erlang-inets-19.3-1.el7.centos \ + erlang-kernel-19.3-1.el7.centos \ + erlang-mnesia-19.3-1.el7.centos \ + erlang-ssl-19.3-1.el7.centos \ + erlang-stdlib-19.3-1.el7.centos + +RUN yumdownloader erlang-cosEvent-19.3-1.el7.centos \ + erlang-cosEventDomain-19.3-1.el7.centos \ + erlang-cosFileTransfer-19.3-1.el7.centos \ + erlang-cosNotification-19.3-1.el7.centos \ + erlang-cosProperty-19.3-1.el7.centos \ + erlang-cosTime-19.3-1.el7.centos \ + erlang-cosTransactions-19.3-1.el7.centos \ + erlang-orber-19.3-1.el7.centos + +RUN rpm -Uvh erlang-orber-19.3-1.el7.centos.x86_64.rpm \ + erlang-cosEvent-19.3-1.el7.centos.x86_64.rpm \ + erlang-cosEventDomain-19.3-1.el7.centos.x86_64.rpm \ + erlang-cosFileTransfer-19.3-1.el7.centos.x86_64.rpm \ + erlang-cosNotification-19.3-1.el7.centos.x86_64.rpm \ + erlang-cosProperty-19.3-1.el7.centos.x86_64.rpm \ + erlang-cosTime-19.3-1.el7.centos.x86_64.rpm \ + erlang-cosTransactions-19.3-1.el7.centos.x86_64.rpm + + +RUN yum install -y \ + erlang-19.3-1.el7.centos \ + rpm-build diff --git a/docker/centos_19/Dockerfile b/docker/centos_19/Dockerfile deleted file mode 100644 index 157e746..0000000 --- a/docker/centos_19/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -FROM centos - -RUN yum -y update - -RUN yum install -y \ - gcc \ - systemd-devel \ - make \ - git \ - wget \ - which \ - epel-release \ - nano - - - - -RUN wget https://packages.erlang-solutions.com/erlang-solutions-1.0-1.noarch.rpm - -RUN rpm -Uvh erlang-solutions-1.0-1.noarch.rpm - -RUN yum update -y - -RUN yum install -y \ - erlang-19.1-1.el7.centos.x86_64 \ - rebar \ - erlang-rebar \ - rpm-build diff --git a/docker/ubuntu_19.3/Dockerfile b/docker/ubuntu_19.3/Dockerfile new file mode 100644 index 0000000..aec218a --- /dev/null +++ b/docker/ubuntu_19.3/Dockerfile @@ -0,0 +1,65 @@ +FROM ubuntu:16.04 + +RUN apt-get -y update + +RUN apt-get install -y \ + gcc \ + make \ + git \ + wget \ + build-essential \ + devscripts \ + fakeroot \ + debhelper \ + libsystemd-dev + + +RUN wget https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb +RUN dpkg -i erlang-solutions_1.0_all.deb +RUN apt-get update -y +RUN apt-get install -y erlang-base=1:19.3-1 \ + erlang-syntax-tools=1:19.3-1 \ + erlang-examples=1:19.3-1 \ + erlang-src=1:19.3-1 \ + erlang-ic=1:19.3-1 \ + erlang-ic-java=1:19.3-1 \ + erlang-asn1=1:19.3-1 \ + erlang-crypto=1:19.3-1 \ + erlang-public-key=1:19.3-1 \ + erlang-ssl=1:19.3-1 \ + erlang-mnesia=1:19.3-1 \ + erlang-runtime-tools=1:19.3-1 \ + erlang-dev=1:19.3-1 \ + erlang-diameter=1:19.3-1 \ + erlang-eldap=1:19.3-1 \ + erlang-appmon=1:19.3-1 \ + erlang-common-test=1:19.3-1 \ + erlang-corba=1:19.3-1 \ + erlang-debugger=1:19.3-1 \ + erlang-dialyzer=1:19.3-1 \ + erlang-edoc=1:19.3-1 \ + erlang-erl-docgen=1:19.3-1 \ + erlang-et=1:19.3-1 \ + erlang-eunit=1:19.3-1 \ + erlang-gs=1:19.3-1 \ + erlang-inets=1:19.3-1 \ + erlang-inviso=1:19.3-1 \ + erlang-megaco=1:19.3-1 \ + erlang-observer=1:19.3-1 \ + erlang-odbc=1:19.3-1 \ + erlang-os-mon=1:19.3-1 \ + erlang-parsetools=1:19.3-1 \ + erlang-percept=1:19.3-1 \ + erlang-pman=1:19.3-1 \ + erlang-reltool=1:19.3-1 \ + erlang-snmp=1:19.3-1 \ + erlang-ssh=1:19.3-1 \ + erlang-test-server=1:19.3-1 \ + erlang-toolbar=1:19.3-1 \ + erlang-tools=1:19.3-1 \ + erlang-tv=1:19.3-1 \ + erlang-typer=1:19.3-1 \ + erlang-webtool=1:19.3-1 \ + erlang-wx=1:19.3-1 \ + erlang-xmerl=1:19.3-1 \ + erlang=1:19.3-1 diff --git a/docker/ubuntu_19/Dockerfile b/docker/ubuntu_19/Dockerfile deleted file mode 100644 index 7942b95..0000000 --- a/docker/ubuntu_19/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM ubuntu - -RUN apt-get -y update - -RUN apt-get install -y \ - gcc \ - make \ - git \ - wget \ - build-essential \ - devscripts \ - fakeroot \ - debhelper \ - libsystemd-dev\ - rebar - - -RUN wget https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb -RUN dpkg -i erlang-solutions_1.0_all.deb -RUN apt-get update -y -RUN apt-get install erlang=1:19.3-1 -y -RUN apt-get install -y erlang-dev \ - erlang-eunit -- cgit v1.2.1 From 0f91d03fe478961522718caacd6b1f619ed61f8c Mon Sep 17 00:00:00 2001 From: getong Date: Fri, 27 Jul 2018 20:09:41 +0800 Subject: add erlang 20 and 21 dockerfiles --- docker/centos_20.3/Dockerfile | 50 +++++++++++++++++++++++++++++++++ docker/centos_21/Dockerfile | 36 ++++++++++++++++++++++++ docker/ubuntu_20.3/Dockerfile | 64 +++++++++++++++++++++++++++++++++++++++++++ docker/ubuntu_21/Dockerfile | 22 +++++++++++++++ 4 files changed, 172 insertions(+) create mode 100644 docker/centos_20.3/Dockerfile create mode 100644 docker/centos_21/Dockerfile create mode 100644 docker/ubuntu_20.3/Dockerfile create mode 100644 docker/ubuntu_21/Dockerfile diff --git a/docker/centos_20.3/Dockerfile b/docker/centos_20.3/Dockerfile new file mode 100644 index 0000000..efca1cc --- /dev/null +++ b/docker/centos_20.3/Dockerfile @@ -0,0 +1,50 @@ +FROM centos + +RUN yum -y update + +RUN yum install -y \ + gcc \ + systemd-devel \ + make \ + git \ + wget \ + which \ + epel-release \ + nano + + +RUN wget https://packages.erlang-solutions.com/erlang-solutions-1.0-1.noarch.rpm + +RUN rpm -Uvh erlang-solutions-1.0-1.noarch.rpm + +RUN yum update -y + +RUN yum install -y erlang-erts-20.3-1.el7.centos \ + erlang-inets-20.3-1.el7.centos \ + erlang-kernel-20.3-1.el7.centos \ + erlang-mnesia-20.3-1.el7.centos \ + erlang-ssl-20.3-1.el7.centos \ + erlang-stdlib-20.3-1.el7.centos + +RUN yumdownloader erlang-cosEvent-20.3-1.el7.centos \ + erlang-cosEventDomain-20.3-1.el7.centos \ + erlang-cosFileTransfer-20.3-1.el7.centos \ + erlang-cosNotification-20.3-1.el7.centos \ + erlang-cosProperty-20.3-1.el7.centos \ + erlang-cosTime-20.3-1.el7.centos \ + erlang-cosTransactions-20.3-1.el7.centos \ + erlang-orber-20.3-1.el7.centos + +RUN rpm -Uvh erlang-orber-20.3-1.el7.centos.x86_64.rpm \ + erlang-cosEvent-20.3-1.el7.centos.x86_64.rpm \ + erlang-cosEventDomain-20.3-1.el7.centos.x86_64.rpm \ + erlang-cosFileTransfer-20.3-1.el7.centos.x86_64.rpm \ + erlang-cosNotification-20.3-1.el7.centos.x86_64.rpm \ + erlang-cosProperty-20.3-1.el7.centos.x86_64.rpm \ + erlang-cosTime-20.3-1.el7.centos.x86_64.rpm \ + erlang-cosTransactions-20.3-1.el7.centos.x86_64.rpm + + +RUN yum install -y \ + erlang-20.3-1.el7.centos \ + rpm-build diff --git a/docker/centos_21/Dockerfile b/docker/centos_21/Dockerfile new file mode 100644 index 0000000..9d29d84 --- /dev/null +++ b/docker/centos_21/Dockerfile @@ -0,0 +1,36 @@ +FROM centos + +RUN yum -y update + +RUN yum install -y \ + gcc \ + systemd-devel \ + make \ + git \ + wget \ + which \ + epel-release \ + nano + + + + +#RUN wget https://packages.erlang-solutions.com/erlang-solutions-1.0-1.noarch.rpm + +#RUN rpm -Uvh erlang-solutions-1.0-1.noarch.rpm + +RUN echo $'[rabbitmq-erlang] \n\ +name=rabbitmq-erlang \n\ +baseurl=https://dl.bintray.com/rabbitmq/rpm/erlang/21/el/7 \n\ +gpgcheck=1 \n\ +gpgkey=https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc \n\ +repo_gpgcheck=0 \n\ +enabled=1 \n\ +' > /etc/yum.repos.d/rabbitmq-erlang.repo + + +RUN yum update -y + +RUN yum install -y \ + erlang-21.0.4-1.el7.centos.x86_64 \ + rpm-build diff --git a/docker/ubuntu_20.3/Dockerfile b/docker/ubuntu_20.3/Dockerfile new file mode 100644 index 0000000..6adcdf3 --- /dev/null +++ b/docker/ubuntu_20.3/Dockerfile @@ -0,0 +1,64 @@ +FROM ubuntu:16.04 + +RUN apt-get -y update + +RUN apt-get install -y \ + gcc \ + make \ + git \ + wget \ + build-essential \ + devscripts \ + fakeroot \ + debhelper \ + libsystemd-dev + + +RUN wget https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb +RUN dpkg -i erlang-solutions_1.0_all.deb +RUN apt-get update -y +RUN apt-get install -y erlang-base=1:20.3-1 \ + erlang-syntax-tools=1:20.3-1 \ + erlang-examples=1:20.3-1 \ + erlang-src=1:20.3-1 \ + erlang-ic=1:20.3-1 \ + erlang-ic-java=1:20.3-1 \ + erlang-asn1=1:20.3-1 \ + erlang-crypto=1:20.3-1 \ + erlang-public-key=1:20.3-1 \ + erlang-ssl=1:20.3-1 \ + erlang-mnesia=1:20.3-1 \ + erlang-runtime-tools=1:20.3-1 \ + erlang-dev=1:20.3-1 \ + erlang-diameter=1:20.3-1 \ + erlang-eldap=1:20.3-1 \ + erlang-appmon=1:20.3-1 \ + erlang-common-test=1:20.3-1 \ + erlang-corba=1:20.3-1 \ + erlang-debugger=1:20.3-1 \ + erlang-dialyzer=1:20.3-1 \ + erlang-edoc=1:20.3-1 \ + erlang-erl-docgen=1:20.3-1 \ + erlang-et=1:20.3-1 \ + erlang-eunit=1:20.3-1 \ + erlang-gs=1:20.3-1 \ + erlang-inets=1:20.3-1 \ + erlang-inviso=1:20.3-1 \ + erlang-megaco=1:20.3-1 \ + erlang-observer=1:20.3-1 \ + erlang-odbc=1:20.3-1 \ + erlang-os-mon=1:20.3-1 \ + erlang-parsetools=1:20.3-1 \ + erlang-percept=1:20.3-1 \ + erlang-pman=1:20.3-1 \ + erlang-reltool=1:20.3-1 \ + erlang-snmp=1:20.3-1 \ + erlang-ssh=1:20.3-1 \ + erlang-test-server=1:20.3-1 \ + erlang-toolbar=1:20.3-1 \ + erlang-tools=1:20.3-1 \ + erlang-tv=1:20.3-1 \ + erlang-typer=1:20.3-1 \ + erlang-wx=1:20.3-1 \ + erlang-xmerl=1:20.3-1 \ + erlang=1:20.3-1 diff --git a/docker/ubuntu_21/Dockerfile b/docker/ubuntu_21/Dockerfile new file mode 100644 index 0000000..a830682 --- /dev/null +++ b/docker/ubuntu_21/Dockerfile @@ -0,0 +1,22 @@ +FROM ubuntu:16.04 + +RUN apt-get -y update + +RUN apt-get install -y \ + gcc \ + make \ + git \ + wget \ + build-essential \ + devscripts \ + fakeroot \ + debhelper \ + libsystemd-dev + + +RUN wget https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb +RUN dpkg -i erlang-solutions_1.0_all.deb +RUN apt-get update -y +RUN apt-get install erlang=1:21.0-1 -y +RUN apt-get install -y erlang-dev \ + erlang-eunit -- cgit v1.2.1 From daf0c3b0b94b6ee6fc69156e028fc4475365aade Mon Sep 17 00:00:00 2001 From: getong Date: Fri, 27 Jul 2018 20:10:21 +0800 Subject: test erlang 20 and 21 --- .travis.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97b3e99..dbf965b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,20 @@ services: before_install: - docker build -t build_ubuntu_18_3 docker/ubuntu_18_3/ -- docker build -t build_ubuntu_19 docker/ubuntu_19/ +- docker build -t build_ubuntu_19.3 docker/ubuntu_19.3/ +- docker build -t build_ubuntu_20.3 docker/ubuntu_20.3/ +- docker build -t build_ubuntu_21 docker/ubuntu_21/ - docker build -t build_centos_18_3 docker/centos_18_3/ -- docker build -t build_centos_19 docker/centos_19/ +- docker build -t build_centos_19.3 docker/centos_19.3/ +- docker build -t build_centos_20.3 docker/centos_20.3/ +- docker build -t build_centos_21 docker/centos_21/ script: - docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_ubuntu_18_3 /bin/sh -c "cd /home/sd/; make all; make test" -- docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_ubuntu_19 /bin/sh -c "cd /home/sd/; make all; make test" +- docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_ubuntu_19.3 /bin/sh -c "cd /home/sd/; make all; make test" +- docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_ubuntu_20.3 /bin/sh -c "cd /home/sd/; make all; make test" +- docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_ubuntu_21 /bin/sh -c "cd /home/sd/; make all; make test" - docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_centos_18_3 /bin/sh -c "cd /home/sd/; make all; make test" -- docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_centos_19 /bin/sh -c "cd /home/sd/; make all; make test" +- docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_centos_19.3 /bin/sh -c "cd /home/sd/; make all; make test" +- docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_centos_20.3 /bin/sh -c "cd /home/sd/; make all; make test" +- docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_centos_21 /bin/sh -c "cd /home/sd/; make all; make test" -- cgit v1.2.1