summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriele Santomaggio <G.santomaggio@gmail.com>2016-07-06 16:42:31 +0200
committerGitHub <noreply@github.com>2016-07-06 16:42:31 +0200
commitc9641a8a5093cb03b8fe9a0d5bfc65f430407fff (patch)
tree83ef6edaed84621ccaf98ebdffaecfb800a229a8
parentfcd8a19b03b42f0b32808efcccc4fee78d3d3da6 (diff)
parent092ded8657ed5ab810b2f7a2c21670f1b1ab3185 (diff)
downloaderlang-sd_notify-c9641a8a5093cb03b8fe9a0d5bfc65f430407fff.tar.gz
Merge pull request #12 from systemd/erlang-sd_notify-erl_19
Added Docker for Erlang 19
-rw-r--r--.travis.yml4
-rw-r--r--README.md14
-rw-r--r--docker/centos_18_3/Dockerfile (renamed from docker/centos/Dockerfile)0
-rw-r--r--docker/ubuntu_18_3/Dockerfile (renamed from docker/ubuntu/Dockerfile)0
-rw-r--r--docker/ubuntu_19/Dockerfile23
5 files changed, 35 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index f1aea13..b802b21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,8 @@ services:
- docker
before_install:
-- docker build -t build_ubuntu https://raw.githubusercontent.com/systemd/erlang-sd_notify/master/docker/ubuntu/Dockerfile
+- docker build -t build_ubuntu https://raw.githubusercontent.com/systemd/erlang-sd_notify/master/docker/ubuntu_18_3/Dockerfile
- docker images
script:
-- docker run -v $TRAVIS_BUILD_DIR:/sd/ build_ubuntu /bin/sh -c "cd /sd/; make all"
+- docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_ubuntu /bin/sh -c "cd /home/sd/; make all"
diff --git a/README.md b/README.md
index 79b754e..1310de6 100644
--- a/README.md
+++ b/README.md
@@ -30,17 +30,23 @@ Build from source using Docker
On Ubuntu
```bash
- docker build -t build_ubuntu docker/ubuntu/
- docker run -v {sd_notify_dir}:/sd/ build_ubuntu /bin/sh -c "cd /sd/; make deb"
+ docker build -t build_ubuntu docker/ubuntu_{version}/
+ docker run -v {sd_notify_dir}:/home/sd/ build_ubuntu_{version} /bin/sh -c "cd /home/sd/; make deb"
```
on Centos
```bash
- docker build -t build_centos docker/centos/
- docker run -v {sd_notify_dir}:/sd/ build_centos /bin/sh -c "cd /sd/; make all"
+ docker build -t build_centos docker/centos_{version}/
+ docker run -v {sd_notify_dir}:/sd/ build_centos_{version} /bin/sh -c "cd /sd/; make all"
```
+Example
+
+```bash
+ docker build -t build_centos docker/ubuntu_19/
+ docker run -v /home/gabriele/erlang-sd_notify:/home/sd/ build_ubunut_19 /bin/sh -c "cd /home/sd/; make all"
+```
Download Binaries
===
diff --git a/docker/centos/Dockerfile b/docker/centos_18_3/Dockerfile
index f6653f7..f6653f7 100644
--- a/docker/centos/Dockerfile
+++ b/docker/centos_18_3/Dockerfile
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu_18_3/Dockerfile
index 52d91a7..52d91a7 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu_18_3/Dockerfile
diff --git a/docker/ubuntu_19/Dockerfile b/docker/ubuntu_19/Dockerfile
new file mode 100644
index 0000000..d38e286
--- /dev/null
+++ b/docker/ubuntu_19/Dockerfile
@@ -0,0 +1,23 @@
+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.0-1 -y
+RUN apt-get install -y erlang-dev \
+ erlang-eunit