aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix up Dockerfile to use ubuntu:bionic and actually build (#3540)

Browse source 
* 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
This commit is contained in:
Filip Sufitchi 2019-01-31 19:01:17 -05:00 committed by Zach H
parent 3562a48984
commit 6e1b0a7590
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Dockerfile
View file

@ -1,30 +1,23 @@
FROM ubuntu:trusty FROM ubuntu:bionic
MAINTAINER Zach Halpern <zahalpern+github@gmail.com> 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\ RUN apt-get update && apt-get install -y\
build-essential g++\ build-essential\
cmake\ cmake\
git\ git\
libprotobuf-dev\ libprotobuf-dev\
libqt5sql5-mysql\
protobuf-compiler\ protobuf-compiler\
qt5-default\ qt5-default\
qtbase5-dev\ qtbase5-dev\
qttools5-dev-tools\ qttools5-dev-tools\
qttools5-dev\ 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 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 WORKDIR build
RUN cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 &&\ RUN cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 &&\