From 6e1b0a7590d27b9a74bfb8d30156eb9fee3893ab Mon Sep 17 00:00:00 2001
From: Filip Sufitchi <fsufitch@users.noreply.github.com>
Date: Thu, 31 Jan 2019 19:01:17 -0500
Subject: [PATCH] Fix up Dockerfile to use ubuntu:bionic and actually build
 (#3540)

* Fix up Dockerfile to use ubuntu:bionic and actually build

* Remove commented PPA

* Fix up Dockerfile to use ubuntu:bionic and actually build

* cleanup

* fixup merge
---
 Dockerfile | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1a61753a..e96f3405 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,30 +1,23 @@
-FROM ubuntu:trusty
+FROM ubuntu:bionic
 MAINTAINER Zach Halpern <zahalpern+github@gmail.com>
 
-RUN apt-get update && apt-get install -y software-properties-common
-RUN apt-add-repository ppa:ubuntu-sdk-team/ppa
-RUN add-apt-repository -y ppa:smspillaz/cmake-master
 RUN apt-get update && apt-get install -y\
-  build-essential g++\
+  build-essential\
   cmake\
   git\
   libprotobuf-dev\
+  libqt5sql5-mysql\
   protobuf-compiler\
   qt5-default\
   qtbase5-dev\
   qttools5-dev-tools\
   qttools5-dev\
-  libqt5sql5-mysql
+  software-properties-common
+
+COPY . /home/servatrice/code/
+WORKDIR /home/servatrice/code
 
-ENV dir /home/servatrice/code
-WORKDIR $dir
 RUN mkdir oracle
-COPY LICENSE LICENSE
-COPY CMakeLists.txt CMakeLists.txt
-COPY cmake/ cmake/
-COPY common/ common/
-COPY servatrice/ servatrice/
-COPY README.md README.md
 
 WORKDIR build
 RUN cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 &&\