From 91f0cf223fc15fcc54c29246df2694c6ae6d506a Mon Sep 17 00:00:00 2001
From: Erik Schilling <git@ablu.org>
Date: Wed, 3 Oct 2018 14:49:52 +0200
Subject: Properly install as part of the docker image

---
 Dockerfile | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'Dockerfile')

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/
-- 
cgit v1.2.3-70-g09d2