diff options
| author | Ingy döt Net <ingy@ingy.net> | 2018-01-07 13:23:08 -0800 |
|---|---|---|
| committer | Ingy döt Net <ingy@ingy.net> | 2018-01-08 00:21:04 -0800 |
| commit | a9a9b271fe6ea6c856159033e2328a3098bf1cc3 (patch) | |
| tree | 066aae2927ce9289660aedf2338cab33ab528e9d | |
| parent | a70c7f36cb46a7fbda862389b4d602f5444ff3f2 (diff) | |
| download | libyaml-git-a9a9b271fe6ea6c856159033e2328a3098bf1cc3.tar.gz | |
Docker test file changes (added alpine testing)
Also reworked all the dockerfiles to be cleaner and consistent:
* Fixed some indentation
* Removed vim dependencies
* Collapsed RUN steps for less build layers
* Renamed dockerfiles/ to shorter and more adaptable docker/
| -rw-r--r-- | docker/README.mkd (renamed from dockerfiles/README.mkd) | 0 | ||||
| -rw-r--r-- | docker/alpine-3.7 | 26 | ||||
| -rw-r--r-- | docker/fedora-25 (renamed from dockerfiles/fedora-25) | 23 | ||||
| -rw-r--r-- | docker/ubuntu-14.04 (renamed from dockerfiles/ubuntu-14.04) | 16 | ||||
| -rw-r--r-- | docker/ubuntu-16.04 (renamed from dockerfiles/ubuntu-16.04) | 16 |
5 files changed, 54 insertions, 27 deletions
diff --git a/dockerfiles/README.mkd b/docker/README.mkd index 71c13e1..71c13e1 100644 --- a/dockerfiles/README.mkd +++ b/docker/README.mkd diff --git a/docker/alpine-3.7 b/docker/alpine-3.7 new file mode 100644 index 0000000..ac2d625 --- /dev/null +++ b/docker/alpine-3.7 @@ -0,0 +1,26 @@ +# vim: ft=dockerfile +FROM alpine:3.7 +MAINTAINER Ingy döt Net <ingy@ingy.net> + +RUN apk update && \ + apk add --no-cache \ + autoconf \ + automake \ + build-base \ + cmake \ + git \ + libtool \ + perl-dev && \ + mkdir /libyaml + +COPY . /libyaml/ +WORKDIR /libyaml + +ENV LD_LIBRARY_PATH=/libyaml/src/.libs + +RUN ./bootstrap && \ + ./configure && \ + make && \ + make install + +CMD ["bash"] diff --git a/dockerfiles/fedora-25 b/docker/fedora-25 index ae34448..36e58ab 100644 --- a/dockerfiles/fedora-25 +++ b/docker/fedora-25 @@ -5,21 +5,22 @@ MAINTAINER Ian Cordasco <graffatcolmingov@gmail.com> # NOTE(sigmavirus24): We need "perl-core" here for the "prove" binary # required by the test-all Makefile target RUN dnf install -y \ - automake \ - gcc \ - git \ - make \ - libtool \ - perl-core + automake \ + gcc \ + git \ + make \ + libtool \ + perl-core && \ + mkdir /libyaml -RUN mkdir /libyaml COPY . /libyaml/ WORKDIR /libyaml ENV LD_LIBRARY_PATH=/libyaml/src/.libs -RUN ./bootstrap -RUN ./configure -RUN make -RUN make install +RUN ./bootstrap && \ + ./configure && \ + make && \ + make install + CMD ["bash"] diff --git a/dockerfiles/ubuntu-14.04 b/docker/ubuntu-14.04 index ffb7c6b..6a2b134 100644 --- a/dockerfiles/ubuntu-14.04 +++ b/docker/ubuntu-14.04 @@ -12,18 +12,18 @@ RUN apt-get update && \ autoconf \ build-essential \ git \ - libtool \ - vim && \ - rm -rf /var/lib/apt/lists/* + libtool && \ + rm -rf /var/lib/apt/lists/* && \ + mkdir /libyaml -RUN mkdir /libyaml COPY . /libyaml/ WORKDIR /libyaml ENV LD_LIBRARY_PATH=/libyaml/src/.libs -RUN ./bootstrap -RUN ./configure -RUN make -RUN make install +RUN ./bootstrap && \ + ./configure && \ + make && \ + make install + CMD ["bash"] diff --git a/dockerfiles/ubuntu-16.04 b/docker/ubuntu-16.04 index 5c4ee17..87b7afd 100644 --- a/dockerfiles/ubuntu-16.04 +++ b/docker/ubuntu-16.04 @@ -7,18 +7,18 @@ RUN apt-get update && \ autoconf \ build-essential \ git \ - libtool \ - vim && \ - rm -rf /var/lib/apt/lists/* + libtool && \ + rm -rf /var/lib/apt/lists/* && \ + mkdir /libyaml -RUN mkdir /libyaml COPY . /libyaml/ WORKDIR /libyaml ENV LD_LIBRARY_PATH=/libyaml/src/.libs -RUN ./bootstrap -RUN ./configure -RUN make -RUN make install +RUN ./bootstrap && \ + ./configure && \ + make && \ + make install + CMD ["bash"] |