diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..cf3913aa0 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +.git +.gitignore +**/.DS_Store diff --git a/.gitignore b/.gitignore index 163010acf..e72b0ac29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -.DS_Store +*.DS_Store !Build/ .last_cover_stats diff --git a/Dockerfile b/Dockerfile index 1707d638a..c0304471e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,31 @@ -FROM alpine:3.4 -MAINTAINER Mojolicious +FROM ubuntu:18.04 +MAINTAINER Rederly WORKDIR /usr/app -COPY cpanfile . +RUN apt-get update \ + && apt-get install -y --no-install-recommends --no-install-suggests \ + curl \ + dvipng \ + gcc \ + make \ + libgd-perl \ + cpanminus \ + libstring-shellquote-perl \ + libproc-processtable-perl \ + libdatetime-perl \ + libdbi-perl \ + libtie-ixhash-perl \ + libuuid-tiny-perl \ + libjson-perl \ + liblocale-maketext-lexicon-perl \ + libclass-accessor-perl \ + libcgi-pm-perl \ + && apt-get clean \ + && rm -fr /var/lib/apt/lists/* /tmp/* -RUN apk update && \ - apk add perl perl-io-socket-ssl perl-dbd-pg perl-dev g++ make wget curl && \ - curl -L https://cpanmin.us | perl - App::cpanminus && \ - cpanm --installdeps . -M https://cpan.metacpan.org && \ - apk del perl-dev g++ make wget curl && \ - rm -rf /root/.cpanm/* /usr/local/share/man/* +RUN cpanm install Mojolicious Date::Format \ + && rm -fr ./cpanm /root/.cpanm /tmp/* COPY . . diff --git a/cpanfile b/cpanfile deleted file mode 100644 index 09671ecb2..000000000 --- a/cpanfile +++ /dev/null @@ -1 +0,0 @@ -requires "Mojolicious"; diff --git a/lib/.DS_Store b/lib/.DS_Store deleted file mode 100644 index 4f2ae90be..000000000 Binary files a/lib/.DS_Store and /dev/null differ diff --git a/lib/LibraryApp.pm b/lib/RenderApp.pm similarity index 100% rename from lib/LibraryApp.pm rename to lib/RenderApp.pm diff --git a/lib/WeBWorK/.DS_Store b/lib/WeBWorK/.DS_Store deleted file mode 100644 index 62a5338e7..000000000 Binary files a/lib/WeBWorK/.DS_Store and /dev/null differ diff --git a/lib/WeBWorK/lib/.DS_Store b/lib/WeBWorK/lib/.DS_Store deleted file mode 100644 index b8267576a..000000000 Binary files a/lib/WeBWorK/lib/.DS_Store and /dev/null differ diff --git a/lib/WeBWorK/lib/WeBWorK/.DS_Store b/lib/WeBWorK/lib/WeBWorK/.DS_Store deleted file mode 100644 index eaae0d1c1..000000000 Binary files a/lib/WeBWorK/lib/WeBWorK/.DS_Store and /dev/null differ diff --git a/library_app.conf b/render_app.conf similarity index 100% rename from library_app.conf rename to render_app.conf