diff options
| author | Peter Lemenkov <lemenkov@gmail.com> | 2016-07-02 15:08:48 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-02 15:08:48 +0400 |
| commit | 891bc6de32f70975888b985a17b01ddd33018115 (patch) | |
| tree | 44ffb87b93c4143e280bd8ff0a2bd87aa6e62632 | |
| parent | 5adb78edb7cc92f515c838ea663b0a0547304cc7 (diff) | |
| parent | 210d8edd64436038f7128ddef6cd8970a96e9412 (diff) | |
| download | erlang-sd_notify-891bc6de32f70975888b985a17b01ddd33018115.tar.gz | |
Merge pull request #10 from Gsantomaggio/master
docker build
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | docker/centos/Dockerfile (renamed from docker/Dockerfile) | 1 | ||||
| -rw-r--r-- | docker/ubuntu/Dockerfile | 22 | ||||
| -rw-r--r-- | src/sd_notify.erl | 3 |
5 files changed, 40 insertions, 4 deletions
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" @@ -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/centos/Dockerfile index 9062068..f6653f7 100644 --- a/docker/Dockerfile +++ b/docker/centos/Dockerfile @@ -12,7 +12,6 @@ RUN yum install -y \ -RUN mkdir /build && cd /build RUN wget https://www.rabbitmq.com/releases/erlang/erlang-18.3-1.el7.centos.x86_64.rpm 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). |