summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2019-07-25 14:30:04 +0200
committerYorhel <git@yorhel.nl>2019-07-25 14:36:21 +0200
commitf296495a912ce759df11c43e78b4552788bdbff2 (patch)
tree0c10802de65fb7c8475722e12234bff5eb980628 /Dockerfile
parent0f3cfeb85caec6424bcbea47142eefbf8011636b (diff)
Merge the v3 branch into separate namespace + fix Docker stuff (again)
I was getting tired of having to keep two branches up-to-date with the latest developments, so decided to throw v3 into the same branch - just different files (...which will get mostly rewritten again soon). The two versions aren't very different in terms of dependencies, build system and support code, so they can now properly share files. Added a section to the README to avoid confusion. This merge also makes it easier to quickly switch between the different versions, which is handy for development. It's even possible to run both at the same time, but my scripts use the same port so that needs a workaround. And it's amazing how often I break the Docker scripts.
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile71
1 files changed, 40 insertions, 31 deletions
diff --git a/Dockerfile b/Dockerfile
index c4b73396..c844d1b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,41 +1,50 @@
FROM ubuntu:bionic
MAINTAINER Yoran Heling <contact@vndb.org>
-RUN apt-get update
+RUN apt-get update \
+ && apt-get install -y locales \
+ && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-RUN apt-get install -y locales && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
ENV LANG en_US.utf8
-RUN apt-get install -y tzdata && apt-get install -y --no-install-recommends \
- build-essential \
- cpanminus \
- curl \
- git \
- graphviz \
- imagemagick \
- libalgorithm-diff-xs-perl \
- libanyevent-irc-perl \
- libanyevent-perl \
- libcrypt-urandom-perl \
- libdbd-pg-perl \
- libfcgi-perl \
- libhttp-server-simple-perl \
- libimage-magick-perl \
- libjson-xs-perl \
- libperlio-gzip-perl \
- libpq-dev \
- libtext-multimarkdown-perl \
- libtie-ixhash-perl \
- libxml-parser-perl \
- postgresql
-
-# These modules aren't packaged
-RUN cpanm -vn \
- Crypt::ScryptKDF \
- AnyEvent::Pg
+RUN apt-get install -y tzdata \
+ && apt-get install -y --no-install-recommends \
+ build-essential \
+ cpanminus \
+ curl \
+ git \
+ graphviz \
+ imagemagick \
+ libalgorithm-diff-xs-perl \
+ libanyevent-irc-perl \
+ libanyevent-perl \
+ libcrypt-urandom-perl \
+ libdbd-pg-perl \
+ libfcgi-perl \
+ libhttp-server-simple-perl \
+ libimage-magick-perl \
+ libjson-xs-perl \
+ libperlio-gzip-perl \
+ libpq-dev \
+ libtext-multimarkdown-perl \
+ libtie-ixhash-perl \
+ libxml-parser-perl \
+ postgresql \
+ && cpanm -vn \
+ AnyEvent::Pg \
+ Crypt::ScryptKDF \
+ SQL::Interp
# Get TUWF from Git; I tend to experiment with VNDB before releasing new versions to CPAN.
-RUN cd /root && git clone git://g.blicky.net/tuwf.git && cd tuwf && perl Build.PL && ./Build install
+# Get Elm from the binaries.
+RUN cd /root \
+ && git clone git://g.blicky.net/tuwf.git \
+ && cd tuwf \
+ && perl Build.PL \
+ && ./Build install \
+ && cd /tmp \
+ && curl -sL https://github.com/elm/compiler/releases/download/0.19.0/binaries-for-linux.tar.gz | tar -xzf- \
+ && mv elm /usr/bin \
+ && touch /var/vndb-docker-image
-RUN touch /var/vndb-docker-image
CMD /var/www/util/docker-init.sh