From c17d8624dbae513a66d14a244964172341123523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Tue, 21 Apr 2020 11:21:03 +0200 Subject: Move docker directory to etc/ --- docker/Dockerfile | 25 ------------------------- docker/README.md | 10 ---------- etc/docker/Dockerfile | 25 +++++++++++++++++++++++++ etc/docker/README.md | 10 ++++++++++ 4 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 docker/Dockerfile delete mode 100644 docker/README.md create mode 100644 etc/docker/Dockerfile create mode 100644 etc/docker/README.md diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 46abe85..0000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM ubuntu - -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y \ - git \ - mercurial \ - subversion \ - erlang \ - build-essential \ - autoconf \ - automake \ - curl \ - python-sphinx \ - asciidoc \ - p7zip-full \ - unzip - -COPY . /erlang.mk -WORKDIR /erlang.mk - -# Run specific test-case with verbose output -# RUN make check c=escript-deps V=4 - -RUN make check -j 8 -k -RUN make check LEGACY=1 -j 8 -k diff --git a/docker/README.md b/docker/README.md deleted file mode 100644 index 04cdaa3..0000000 --- a/docker/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Create Docker image to run erlang.mk tests -* clone erlang.mk repository -``` -git clone https://github.com/ninenines/erlang.mk.git -cd erlang.mk -``` -* in git working dir -``` -docker build . -f docker/Dockerfile -``` \ No newline at end of file diff --git a/etc/docker/Dockerfile b/etc/docker/Dockerfile new file mode 100644 index 0000000..46abe85 --- /dev/null +++ b/etc/docker/Dockerfile @@ -0,0 +1,25 @@ +FROM ubuntu + +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections +RUN apt-get update && apt-get install -y \ + git \ + mercurial \ + subversion \ + erlang \ + build-essential \ + autoconf \ + automake \ + curl \ + python-sphinx \ + asciidoc \ + p7zip-full \ + unzip + +COPY . /erlang.mk +WORKDIR /erlang.mk + +# Run specific test-case with verbose output +# RUN make check c=escript-deps V=4 + +RUN make check -j 8 -k +RUN make check LEGACY=1 -j 8 -k diff --git a/etc/docker/README.md b/etc/docker/README.md new file mode 100644 index 0000000..04cdaa3 --- /dev/null +++ b/etc/docker/README.md @@ -0,0 +1,10 @@ +# Create Docker image to run erlang.mk tests +* clone erlang.mk repository +``` +git clone https://github.com/ninenines/erlang.mk.git +cd erlang.mk +``` +* in git working dir +``` +docker build . -f docker/Dockerfile +``` \ No newline at end of file -- cgit v1.2.3