From 210d8edd64436038f7128ddef6cd8970a96e9412 Mon Sep 17 00:00:00 2001 From: Gabriele Santomaggio Date: Sat, 2 Jul 2016 12:02:54 +0200 Subject: docker build --- .travis.yml | 16 ++++++++++++++++ README.md | 2 +- docker/Dockerfile | 23 ----------------------- docker/centos/Dockerfile | 22 ++++++++++++++++++++++ docker/ubuntu/Dockerfile | 22 ++++++++++++++++++++++ src/sd_notify.erl | 3 +-- 6 files changed, 62 insertions(+), 26 deletions(-) create mode 100644 .travis.yml delete mode 100644 docker/Dockerfile create mode 100644 docker/centos/Dockerfile create mode 100644 docker/ubuntu/Dockerfile diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f1aea13 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +sudo: required + +language: erlang + +otp_release: + - 18.2.1 + +services: +- docker + +before_install: +- docker build -t build_ubuntu https://raw.githubusercontent.com/systemd/erlang-sd_notify/master/docker/ubuntu/Dockerfile +- docker images + +script: +- docker run -v $TRAVIS_BUILD_DIR:/sd/ build_ubuntu /bin/sh -c "cd /sd/; make all" diff --git a/README.md b/README.md index 1dc95ed..b9b2abc 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Build from source `RPM` Download the binary - -https://github.com/systemd/erlang-sd_notify/releases/tag/ +https://github.com/systemd/erlang-sd_notify/releases Install and Test - diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 9062068..0000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM centos - -RUN yum -y update - -RUN yum install -y \ - gcc \ - systemd-devel \ - make \ - git \ - wget \ - which - - - -RUN mkdir /build && cd /build - -RUN wget https://www.rabbitmq.com/releases/erlang/erlang-18.3-1.el7.centos.x86_64.rpm - -RUN rpm -i erlang-18.3-1.el7.centos.x86_64.rpm - -RUN wget https://github.com/rebar/rebar/wiki/rebar && chmod +x rebar - - diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile new file mode 100644 index 0000000..f6653f7 --- /dev/null +++ b/docker/centos/Dockerfile @@ -0,0 +1,22 @@ +FROM centos + +RUN yum -y update + +RUN yum install -y \ + gcc \ + systemd-devel \ + make \ + git \ + wget \ + which + + + + +RUN wget https://www.rabbitmq.com/releases/erlang/erlang-18.3-1.el7.centos.x86_64.rpm + +RUN rpm -i erlang-18.3-1.el7.centos.x86_64.rpm + +RUN wget https://github.com/rebar/rebar/wiki/rebar && chmod +x rebar + + diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile new file mode 100644 index 0000000..52d91a7 --- /dev/null +++ b/docker/ubuntu/Dockerfile @@ -0,0 +1,22 @@ +FROM ubuntu + +RUN apt-get -y update + +RUN apt-get install -y \ + gcc \ + make \ + git \ + wget \ + erlang=1:18.3-dfsg-1ubuntu3 \ + build-essential \ + devscripts \ + fakeroot \ + debhelper \ + erlang-dev \ + libsystemd-dev\ + erlang-eunit \ + rebar + + + + diff --git a/src/sd_notify.erl b/src/sd_notify.erl index b190655..5162340 100644 --- a/src/sd_notify.erl +++ b/src/sd_notify.erl @@ -57,7 +57,6 @@ sd_notify(_, _) -> sd_pid_notify(_, _, _) -> ?nif_stub. - sd_notifyf(UnsetEnv, Format, Data) -> sd_notify(UnsetEnv, lists:flatten(io_lib:format(Format, Data))). @@ -71,7 +70,7 @@ sd_pid_notifyf(Pid, UnsetEnv, Format, Data) -> -ifdef(TEST). sd_notify_test() -> - ?assertEqual(ok, ok). + ?assertEqual(ok, ok). sd_notifyf_test() -> ?assertEqual(ok, ok). -- cgit v1.2.1