Skip to content

Commit

Permalink
Patroni 1.4.4 and migrate to ubuntu:18.04 (#226)
Browse files Browse the repository at this point in the history
Since it already has patroni package we will install most of the dependencies as ubuntu packages.
Unfortunately some of the postgres packages must be rebuilt from sources, because they exist only for postgresql-10
  • Loading branch information
CyberDem0n committed May 24, 2018
1 parent 1404d1c commit 8653416
Show file tree
Hide file tree
Showing 10 changed files with 189 additions and 268 deletions.
238 changes: 126 additions & 112 deletions postgres-appliance/Dockerfile.build

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions postgres-appliance/dependencies/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
FROM ubuntu:16.04
FROM ubuntu:18.04

MAINTAINER Alexander Kukushkin <alexander.kukushkin@zalando.de>

#ENV SOURCES="cgal sfcgal gdal r-base"
ENV SOURCES="cgal sfcgal gdal"
#ENV PACKAGES="libcgal11v5 libsfcgal1 libgdal1i r-base-core"
ENV PACKAGES="libcgal11v5 libsfcgal1 libgdal1i"
ENV SOURCES="gdal"
ENV PACKAGES="libgdal20"

RUN export DEBIAN_FRONTEND=noninteractive \
&& echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/01norecommend \
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
55 changes: 0 additions & 55 deletions postgres-appliance/dependencies/patches/cgal.patch

This file was deleted.

117 changes: 60 additions & 57 deletions postgres-appliance/dependencies/patches/gdal.patch
Original file line number Diff line number Diff line change
@@ -1,67 +1,70 @@
--- debian/rules.orig 2016-02-10 16:17:44.000000000 +0000
+++ debian/rules 2017-11-14 12:14:19.000000000 +0000
@@ -93,35 +93,42 @@
--- debian/rules.orig 2018-01-30 06:06:47.000000000 +0000
+++ debian/rules 2018-04-28 11:31:55.013154357 +0000
@@ -101,38 +101,43 @@
--with-rename-internal-libtiff-symbols=yes \
--with-rename-internal-libgeotiff-symbols=yes \
--with-libtiff=internal \
--with-geotiff=internal \
- --with-webp \
- --with-jasper \
- --with-netcdf \
- $(WITH_HDF5) \
- --with-xerces \
+ --without-grib \
+ --without-gif \
+ --without-hdf4 \
+ --without-xml2 \
+ --without-expat \
+ --without-pcre \
+ --without-jpeg \
+ --without-png \
+ --without-webp \
+ --without-jasper \
+ --without-netcdf \
+ --without-xerces \
--with-geos \
- --with-sqlite3 \
--with-threads \
- --with-armadillo=yes \
+ --with-armadillo=no \
--with-cfitsio=no \
- --with-curl \
- --with-pg \
+ --with-curl=no \
--with-ecw=no \
- --with-epsilon=/usr \
- --with-freexl=yes \
+ --with-epsilon=no \
+ --with-freexl=no \
--with-geos \
- --with-geotiff=yes \
+ --with-geotiff=internal \
--with-grass=no \
- $(WITH_HDF5) \
--with-libjson-c=/usr \
- --with-libkml=yes \
+ --with-libkml=no \
--with-liblzma=yes \
- --with-libtiff=yes \
+ --with-libtiff=internal \
--with-mrsid=no \
- --with-mysql \
- --with-perl \
+ --without-sqlite3 \
+ --without-curl \
+ --without-pg \
+ --without-mysql \
+ --without-perl \
--with-ruby=no \
- --with-java=/usr/lib/jvm/default-java \
- --with-python \
- --with-netcdf \
- --with-odbc \
- --with-ogdi \
- --with-openjpeg=yes \
- --with-pg \
- --with-poppler=yes \
- --with-qhull=yes \
- --with-sosi=yes \
- --with-spatialite=/usr \
- --with-sqlite3 \
- --with-webp \
- --with-xerces \
- --with-dods-root=/usr \
+ --without-java \
+ --without-python \
+ --without-odbc \
+ --without-mysql \
+ --without-netcdf \
+ --with-odbc=no \
+ --without-ogdi \
+ --without-dods \
--with-static-proj4=yes \
- --with-spatialite=/usr \
+ --without-spatialite \
--with-cfitsio=no \
--with-ecw=no \
--with-mrsid=no \
- --with-poppler=yes \
- --with-openjpeg=yes \
- --with-freexl=yes \
- --with-libkml=yes \
- --with-armadillo=yes \
+ --with-poppler=no \
+ --without-jpeg12 \
+ --with-jpeg=internal \
+ --with-png=internal \
+ --with-openjpeg=no \
+ --with-freexl=no \
+ --with-libkml=no \
+ --with-armadillo=no \
--with-liblzma=yes \
- --with-epsilon=/usr \
+ --without-epsilon \
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"; \
+ --with-gif=no \
+ --with-hdf4=no \
+ --with-hdf5=no \
+ --without-pg \
+ --with-poppler=no \
+ --with-qhull=no \
+ --with-sosi=no \
+ --with-spatialite=no \
+ --with-sqlite3=no \
+ --with-webp=no \
+ --without-xerces \
+ --with-dods-root=no \
--with-static-proj4=yes \
- --with-java=/usr/lib/jvm/default-java \
- --with-perl \
+ --without-java \
+ --without-perl \
--with-python; \
mv GDALmake.opt GDALmake.opt-$$V; \
done
20 changes: 0 additions & 20 deletions postgres-appliance/dependencies/patches/r-base.patch

This file was deleted.

19 changes: 0 additions & 19 deletions postgres-appliance/dependencies/patches/sfcgal.patch

This file was deleted.

0 comments on commit 8653416

Please sign in to comment.