Skip to content

Commit

Permalink
Docker test file changes (added alpine testing)
Browse files Browse the repository at this point in the history
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/
  • Loading branch information
ingydotnet committed Jan 8, 2018
1 parent a70c7f3 commit a9a9b27
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 27 deletions.
File renamed without changes.
26 changes: 26 additions & 0 deletions 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"]
23 changes: 12 additions & 11 deletions dockerfiles/fedora-25 → docker/fedora-25
Expand Up @@ -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"]
16 changes: 8 additions & 8 deletions dockerfiles/ubuntu-14.04 → docker/ubuntu-14.04
Expand Up @@ -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"]
16 changes: 8 additions & 8 deletions dockerfiles/ubuntu-16.04 → docker/ubuntu-16.04
Expand Up @@ -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"]

0 comments on commit a9a9b27

Please sign in to comment.