Skip to content

Commit

Permalink
Add missing libs
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Valsecchi committed Nov 19, 2018
1 parent 3a1b1d5 commit a0af29a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ else
DOCKER_COMPOSE_VERSION = $(DOCKER_COMPOSE_VERSION_ACTUAL)
endif

DOCKER_TTY := $(shell [ -t 0 ] && echo -ti)

.PHONY: all
all: build acceptance

Expand All @@ -38,7 +40,7 @@ build-builder:
.PHONY: build-src
build-src: build-builder update-src
mkdir -p server/build server/target
docker run --rm -e UID=$(UID) -e GID=$(GID) --volume $(ROOT)/src:/src --volume $(ROOT)/server/build:/build --volume $(ROOT)/server/target:/usr/local --volume $(HOME)/.ccache:/home/builder/.ccache $(DOCKER_BASE)-builder:$(DOCKER_TAG)
docker run $(DOCKER_TTY) --rm -e UID=$(UID) -e GID=$(GID) --volume $(ROOT)/src:/src --volume $(ROOT)/server/build:/build --volume $(ROOT)/server/target:/usr/local --volume $(HOME)/.ccache:/home/builder/.ccache $(DOCKER_BASE)-builder:$(DOCKER_TAG)

run-builder: build-builder update-src
mkdir -p server/build server/target
Expand Down
2 changes: 1 addition & 1 deletion builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN apt-get -y update && \
git ninja-build curl ccache clang \
libpython3.7-dev libqt53dcore5 libqt53dextras5 libqt53dlogic5 libqt53dinput5 libqt53drender5 \
qt3d5-dev qt3d-assimpsceneimport-plugin qt3d-defaultgeometryloader-plugin qt3d-gltfsceneio-plugin qt3d-scene2d-plugin \
libqt5serialport5-dev
libqt5serialport5-dev libexiv2-dev grass-dev

RUN pip3 --no-cache-dir install future psycopg2 numpy nose2 pyyaml mock termcolor PythonQwt && \
curl -L "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" > /usr/bin/gosu && \
Expand Down
4 changes: 2 additions & 2 deletions server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ RUN apt-get -y update && \
python3 python3-pip python3-pyqt5 python3-owslib python3-jinja2 python3-pygments \
python3-pyqt5.qtsql PyQt5.QtSvg \
spawn-fcgi xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb \
apache2 libapache2-mod-fcgid grass \
apache2 libapache2-mod-fcgid grass-core \
python3-gdal python3-pyqt5.qsci python3-pil python3-psycopg2 python3-shapely libpython3.7-dev \
libqt53dcore5 libqt53dextras5 libqt53dlogic5 libqt53dinput5 libqt53drender5 \
libqt5serialport5 libqt5quickwidgets5 && \
libqt5serialport5 libqt5quickwidgets5 libexiv2-14 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

Expand Down

0 comments on commit a0af29a

Please sign in to comment.