summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorErik Schilling <git@ablu.org>2018-10-03 14:49:52 +0200
committerErik Schilling <mail@ablu.org>2018-10-03 13:25:58 +0000
commit91f0cf223fc15fcc54c29246df2694c6ae6d506a (patch)
tree83299e138ecf7098d8d58edf826bf0ab9e8ac14a /Dockerfile
parent78af16a5230a7295008adce5312ff371290f2b54 (diff)
downloadmanaserv-91f0cf223fc15fcc54c29246df2694c6ae6d506a.tar.gz
manaserv-91f0cf223fc15fcc54c29246df2694c6ae6d506a.tar.bz2
manaserv-91f0cf223fc15fcc54c29246df2694c6ae6d506a.tar.xz
manaserv-91f0cf223fc15fcc54c29246df2694c6ae6d506a.zip
Properly install as part of the docker image
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile20
1 files changed, 8 insertions, 12 deletions
diff --git a/Dockerfile b/Dockerfile
index cb96f5ac..9b6bf62a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,15 @@
-FROM centos:7 as builder
+FROM fedora:29 as builder
-RUN yum update -y
-RUN yum install -y epel-release
-RUN yum install -y cmake gcc-c++ make libxml2-devel physfs-devel sqlite-devel \
+RUN dnf install -y cmake gcc-c++ make libxml2-devel physfs-devel sqlite-devel \
lua-devel libsigc++20-devel
ADD . /source
WORKDIR /source
-RUN cmake .
-RUN make
+RUN cmake . -DCMAKE_INSTALL_PREFIX=/app
+RUN make install
-FROM centos:7
-RUN yum install -y epel-release
-RUN yum install -y libxml2 physfs sqlite lua libsigc++20
-COPY --from=builder /source/src/manaserv-account /app/
-COPY --from=builder /source/src/manaserv-game /app/
-COPY --from=builder /source/src/sql/sqlite/createTables.sql /app/
+FROM fedora:29
+RUN dnf update -y
+RUN dnf install -y libxml2 physfs sqlite lua libsigc++20
+COPY --from=builder /app/ /app/