Updated Dockerfile and doc

This commit is contained in:
Fabio Bas 2016-04-11 18:51:44 +02:00
parent 4f30b5cd31
commit a72f9af984
3 changed files with 13 additions and 10 deletions

View file

@ -9,4 +9,3 @@ oracle/
sounds/ sounds/
travis-compile.sh travis-compile.sh
travis-dependencies.sh travis-dependencies.sh
zonebg/

View file

@ -3,21 +3,18 @@ MAINTAINER Gavin Bisesi <Daenyth@gmail.com>
RUN apt-get update && apt-get install -y software-properties-common RUN apt-get update && apt-get install -y software-properties-common
RUN apt-add-repository ppa:ubuntu-sdk-team/ppa 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++\
cmake\ cmake\
git\ git\
libprotobuf-dev\ libprotobuf-dev\
libqt5sql5-mysql\
libqt5svg5-dev\
libqt5webkit5-dev\
libsqlite3-dev\
protobuf-compiler\ protobuf-compiler\
qt5-default\ qt5-default\
qtbase5-dev\ qtbase5-dev\
qtdeclarative5-dev\
qtmultimedia5-dev\
qttools5-dev-tools\ qttools5-dev-tools\
qttools5-dev qttools5-dev\
libqt5sql5-mysql
ENV dir /home/servatrice/code ENV dir /home/servatrice/code
WORKDIR $dir WORKDIR $dir

View file

@ -93,8 +93,15 @@ The following flags can be passed to `cmake`:
- `-DTEST=1` Enable regression tests (default 0 = no). Note: needs googletest, will be downloaded on the fly if unavailable. To run tests: ```make test```. - `-DTEST=1` Enable regression tests (default 0 = no). Note: needs googletest, will be downloaded on the fly if unavailable. To run tests: ```make test```.
#### Building servatrice Docker container #### Servatrice Docker container
`docker build -t servatrice .`<br>
A Dockerfile is provided to run Servatrice (the Cockatrice server) using [Docker](https://www.docker.com/what-docker).
You just need to create an image from the Dockerfile
`docker build -t servatrice .`
And then run it
`docker run -i -p 4747:4747/tcp -t servatrice:latest`
Please note that running this command will expose the TCP port 4747 of the docker container to permit connections to the server.
<br>
# Running # Running