From a9a9b271fe6ea6c856159033e2328a3098bf1cc3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ingy=20d=C3=B6t=20Net?= <ingy@ingy.net>
Date: Sun, 7 Jan 2018 13:23:08 -0800
Subject: [PATCH] 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/
---
 {dockerfiles => docker}/README.mkd   |  0
 docker/alpine-3.7                    | 26 ++++++++++++++++++++++++++
 {dockerfiles => docker}/fedora-25    | 23 ++++++++++++-----------
 {dockerfiles => docker}/ubuntu-14.04 | 16 ++++++++--------
 {dockerfiles => docker}/ubuntu-16.04 | 16 ++++++++--------
 5 files changed, 54 insertions(+), 27 deletions(-)
 rename {dockerfiles => docker}/README.mkd (100%)
 create mode 100644 docker/alpine-3.7
 rename {dockerfiles => docker}/fedora-25 (61%)
 rename {dockerfiles => docker}/ubuntu-14.04 (75%)
 rename {dockerfiles => docker}/ubuntu-16.04 (65%)

diff --git a/dockerfiles/README.mkd b/docker/README.mkd
similarity index 100%
rename from dockerfiles/README.mkd
rename to 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
similarity index 61%
rename from dockerfiles/fedora-25
rename to 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
similarity index 75%
rename from dockerfiles/ubuntu-14.04
rename to 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
similarity index 65%
rename from dockerfiles/ubuntu-16.04
rename to 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"]
-- 
2.45.0