From 1168abb484ce8fd6a524a4849d9d4dd3e0589b20 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sat, 16 Jun 2018 23:54:10 +0200 Subject: docker: move testing resources to tests/docker Relates to https://github.com/shaarli/Shaarli/issues/1153 Signed-off-by: VirtualTam --- docker/test/alpine36/Dockerfile | 34 ---------------------------------- docker/test/debian8/Dockerfile | 35 ----------------------------------- docker/test/debian9/Dockerfile | 36 ------------------------------------ docker/test/ubuntu16/Dockerfile | 36 ------------------------------------ tests/docker/alpine36/Dockerfile | 34 ++++++++++++++++++++++++++++++++++ tests/docker/debian8/Dockerfile | 35 +++++++++++++++++++++++++++++++++++ tests/docker/debian9/Dockerfile | 36 ++++++++++++++++++++++++++++++++++++ tests/docker/ubuntu16/Dockerfile | 36 ++++++++++++++++++++++++++++++++++++ 8 files changed, 141 insertions(+), 141 deletions(-) delete mode 100644 docker/test/alpine36/Dockerfile delete mode 100644 docker/test/debian8/Dockerfile delete mode 100644 docker/test/debian9/Dockerfile delete mode 100644 docker/test/ubuntu16/Dockerfile create mode 100644 tests/docker/alpine36/Dockerfile create mode 100644 tests/docker/debian8/Dockerfile create mode 100644 tests/docker/debian9/Dockerfile create mode 100644 tests/docker/ubuntu16/Dockerfile diff --git a/docker/test/alpine36/Dockerfile b/docker/test/alpine36/Dockerfile deleted file mode 100644 index fa84f6e2..00000000 --- a/docker/test/alpine36/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM alpine:3.6 -MAINTAINER Shaarli Community - -RUN apk --update --no-cache add \ - ca-certificates \ - curl \ - make \ - php7 \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-gd \ - php7-iconv \ - php7-intl \ - php7-json \ - php7-mbstring \ - php7-openssl \ - php7-phar \ - php7-session \ - php7-simplexml \ - php7-tokenizer \ - php7-xdebug \ - php7-xml \ - php7-zlib \ - rsync - -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer - -RUN mkdir /shaarli -WORKDIR /shaarli -VOLUME /shaarli - -ENTRYPOINT ["make"] -CMD [] diff --git a/docker/test/debian8/Dockerfile b/docker/test/debian8/Dockerfile deleted file mode 100644 index eaa34e9b..00000000 --- a/docker/test/debian8/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM debian:jessie -MAINTAINER Shaarli Community - -ENV TERM dumb -ENV DEBIAN_FRONTEND noninteractive -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - -RUN apt-get update \ - && apt-get install --no-install-recommends -y \ - ca-certificates \ - curl \ - locales \ - make \ - php5 \ - php5-curl \ - php5-gd \ - php5-intl \ - php5-xdebug \ - rsync \ - && apt-get clean - -RUN locale-gen en_US.UTF-8 \ - && locale-gen de_DE.UTF-8 \ - && locale-gen fr_FR.UTF-8 - -ADD https://getcomposer.org/composer.phar /usr/local/bin/composer -RUN chmod 755 /usr/local/bin/composer - -RUN mkdir /shaarli -WORKDIR /shaarli -VOLUME /shaarli - -ENTRYPOINT ["make"] -CMD [] diff --git a/docker/test/debian9/Dockerfile b/docker/test/debian9/Dockerfile deleted file mode 100644 index 3ab4b93d..00000000 --- a/docker/test/debian9/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM debian:stretch -MAINTAINER Shaarli Community - -ENV TERM dumb -ENV DEBIAN_FRONTEND noninteractive -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - -RUN apt-get update \ - && apt-get install --no-install-recommends -y \ - ca-certificates \ - curl \ - locales \ - make \ - php7.0 \ - php7.0-curl \ - php7.0-gd \ - php7.0-intl \ - php7.0-xml \ - php-xdebug \ - rsync \ - && apt-get clean - -RUN locale-gen en_US.UTF-8 \ - && locale-gen de_DE.UTF-8 \ - && locale-gen fr_FR.UTF-8 - -ADD https://getcomposer.org/composer.phar /usr/local/bin/composer -RUN chmod 755 /usr/local/bin/composer - -RUN mkdir /shaarli -WORKDIR /shaarli -VOLUME /shaarli - -ENTRYPOINT ["make"] -CMD [] diff --git a/docker/test/ubuntu16/Dockerfile b/docker/test/ubuntu16/Dockerfile deleted file mode 100644 index e53ed9e3..00000000 --- a/docker/test/ubuntu16/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM ubuntu:16.04 -MAINTAINER Shaarli Community - -ENV TERM dumb -ENV DEBIAN_FRONTEND noninteractive -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - -RUN apt-get update \ - && apt-get install --no-install-recommends -y \ - ca-certificates \ - curl \ - language-pack-de \ - language-pack-en \ - language-pack-fr \ - locales \ - make \ - php7.0 \ - php7.0-curl \ - php7.0-gd \ - php7.0-intl \ - php7.0-xml \ - php-xdebug \ - rsync \ - && apt-get clean - -ADD https://getcomposer.org/composer.phar /usr/local/bin/composer -RUN chmod 755 /usr/local/bin/composer - -RUN useradd -m dev \ - && mkdir /shaarli -USER dev -WORKDIR /shaarli - -ENTRYPOINT ["make"] -CMD [] diff --git a/tests/docker/alpine36/Dockerfile b/tests/docker/alpine36/Dockerfile new file mode 100644 index 00000000..fa84f6e2 --- /dev/null +++ b/tests/docker/alpine36/Dockerfile @@ -0,0 +1,34 @@ +FROM alpine:3.6 +MAINTAINER Shaarli Community + +RUN apk --update --no-cache add \ + ca-certificates \ + curl \ + make \ + php7 \ + php7-ctype \ + php7-curl \ + php7-dom \ + php7-gd \ + php7-iconv \ + php7-intl \ + php7-json \ + php7-mbstring \ + php7-openssl \ + php7-phar \ + php7-session \ + php7-simplexml \ + php7-tokenizer \ + php7-xdebug \ + php7-xml \ + php7-zlib \ + rsync + +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + +RUN mkdir /shaarli +WORKDIR /shaarli +VOLUME /shaarli + +ENTRYPOINT ["make"] +CMD [] diff --git a/tests/docker/debian8/Dockerfile b/tests/docker/debian8/Dockerfile new file mode 100644 index 00000000..eaa34e9b --- /dev/null +++ b/tests/docker/debian8/Dockerfile @@ -0,0 +1,35 @@ +FROM debian:jessie +MAINTAINER Shaarli Community + +ENV TERM dumb +ENV DEBIAN_FRONTEND noninteractive +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +RUN apt-get update \ + && apt-get install --no-install-recommends -y \ + ca-certificates \ + curl \ + locales \ + make \ + php5 \ + php5-curl \ + php5-gd \ + php5-intl \ + php5-xdebug \ + rsync \ + && apt-get clean + +RUN locale-gen en_US.UTF-8 \ + && locale-gen de_DE.UTF-8 \ + && locale-gen fr_FR.UTF-8 + +ADD https://getcomposer.org/composer.phar /usr/local/bin/composer +RUN chmod 755 /usr/local/bin/composer + +RUN mkdir /shaarli +WORKDIR /shaarli +VOLUME /shaarli + +ENTRYPOINT ["make"] +CMD [] diff --git a/tests/docker/debian9/Dockerfile b/tests/docker/debian9/Dockerfile new file mode 100644 index 00000000..3ab4b93d --- /dev/null +++ b/tests/docker/debian9/Dockerfile @@ -0,0 +1,36 @@ +FROM debian:stretch +MAINTAINER Shaarli Community + +ENV TERM dumb +ENV DEBIAN_FRONTEND noninteractive +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +RUN apt-get update \ + && apt-get install --no-install-recommends -y \ + ca-certificates \ + curl \ + locales \ + make \ + php7.0 \ + php7.0-curl \ + php7.0-gd \ + php7.0-intl \ + php7.0-xml \ + php-xdebug \ + rsync \ + && apt-get clean + +RUN locale-gen en_US.UTF-8 \ + && locale-gen de_DE.UTF-8 \ + && locale-gen fr_FR.UTF-8 + +ADD https://getcomposer.org/composer.phar /usr/local/bin/composer +RUN chmod 755 /usr/local/bin/composer + +RUN mkdir /shaarli +WORKDIR /shaarli +VOLUME /shaarli + +ENTRYPOINT ["make"] +CMD [] diff --git a/tests/docker/ubuntu16/Dockerfile b/tests/docker/ubuntu16/Dockerfile new file mode 100644 index 00000000..e53ed9e3 --- /dev/null +++ b/tests/docker/ubuntu16/Dockerfile @@ -0,0 +1,36 @@ +FROM ubuntu:16.04 +MAINTAINER Shaarli Community + +ENV TERM dumb +ENV DEBIAN_FRONTEND noninteractive +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +RUN apt-get update \ + && apt-get install --no-install-recommends -y \ + ca-certificates \ + curl \ + language-pack-de \ + language-pack-en \ + language-pack-fr \ + locales \ + make \ + php7.0 \ + php7.0-curl \ + php7.0-gd \ + php7.0-intl \ + php7.0-xml \ + php-xdebug \ + rsync \ + && apt-get clean + +ADD https://getcomposer.org/composer.phar /usr/local/bin/composer +RUN chmod 755 /usr/local/bin/composer + +RUN useradd -m dev \ + && mkdir /shaarli +USER dev +WORKDIR /shaarli + +ENTRYPOINT ["make"] +CMD [] -- cgit v1.2.3