Skip to content

Commit

Permalink
Merge pull request #5 from binakot/upgrade-deps+fixes
Browse files Browse the repository at this point in the history
#3 Upgrade to the latest deps
  • Loading branch information
binakot authored Oct 5, 2020
2 parents 17d6d1e + 54c7246 commit 7594025
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
24 changes: 12 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# https://github.com/docker-library/postgres/blob/master/11/alpine/Dockerfile
FROM postgres:11.3-alpine
# https://github.com/docker-library/postgres/blob/master/12/alpine/Dockerfile
FROM postgres:12.4-alpine

MAINTAINER Ivan Muratov, binakot@gmail.com

# https://postgis.net/docs/manual-2.5/postgis_installation.html
ENV POSTGIS_VERSION 2.5.2
ENV POSTGIS_SHA256 225aeaece00a1a6a9af15526af81bef2af27f4c198de820af1367a792ee1d1a9
ENV POSTGIS_VERSION 2.5.5
ENV POSTGIS_SHA256 24b15ee36f3af02015da0e92a18f9046ea0b4fd24896196c8e6c2aa8e4b56baa
RUN set -ex \
\
&& apk add --no-cache --virtual .fetch-deps \
Expand All @@ -28,15 +28,15 @@ RUN set -ex \
\
geos-dev \
gdal-dev \
proj4-dev \
proj-dev \
protobuf-c-dev \
postgresql-dev \
&& apk add --no-cache --virtual .postgis-deps \
--repository http://dl-cdn.alpinelinux.org/alpine/edge/main \
--repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
geos \
gdal \
proj4 \
proj \
protobuf-c \
\
&& wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/$POSTGIS_VERSION.tar.gz" \
Expand All @@ -60,9 +60,9 @@ RUN set -ex \
&& rm -rf /usr/src/postgis \
&& apk del .fetch-deps .build-deps

# https://docs.timescale.com/v1.3/getting-started/installation/ubuntu/installation-source
ENV TIMESCALEDB_VERSION 1.3.0
ENV TIMESCALEDB_SHA256 9a773f40c7109694ffb9f2eb2c306e70dd04079c010d276c4d60ae88433a6b4c
# https://docs.timescale.com/v1.7/getting-started/installation/ubuntu/installation-source
ENV TIMESCALEDB_VERSION 1.7.4
ENV TIMESCALEDB_SHA256 d0b7a153ff3e02ecf033a869ecdf4286f8610ea76140baa84928fc3a80223e99
RUN set -ex \
&& apk add --no-cache --virtual .fetch-deps \
ca-certificates \
Expand All @@ -87,15 +87,15 @@ RUN set -ex \
--file timescaledb.tar.gz \
--directory /usr/src/timescaledb \
--strip-components 1 \
&& rm timescaledb.tar.gz \
&& rm timescaledb.tar.gz \
\
&& cd /usr/src/timescaledb \
&& ./bootstrap -DPROJECT_INSTALL_METHOD="docker" \
&& ./bootstrap -DPROJECT_INSTALL_METHOD="docker" -DREGRESS_CHECKS=OFF \
&& cd ./build && make install \
\
&& cd / \
&& rm -rf /usr/src/timescaledb \
&& apk del .fetch-deps .build-deps \
&& apk del .fetch-deps .build-deps \
&& sed -r -i "s/[#]*\s*(shared_preload_libraries)\s*=\s*'(.*)'/\1 = 'timescaledb,\2'/;s/,'/'/" /usr/local/share/postgresql/postgresql.conf.sample

COPY ./init-postgis.sh /docker-entrypoint-initdb.d/1.postgis.sh
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ Docker image with:
* [TimescaleDB](https://www.timescale.com/)

Current versions of components:
* PostgreSQL: **11.3** ([Source docker image](https://store.docker.com/images/postgres))
* PostGIS: **2.5.2** ([Release archive](https://github.com/postgis/postgis/releases/tag/2.5.2))
* TimescaleDB: **1.3.0** ([Release archive](https://github.com/timescale/timescaledb/releases/tag/1.3.0))
* PostgreSQL: **12.4** ([Source docker image](https://store.docker.com/images/postgres))
* PostGIS: **2.5.5** ([Release archive](https://github.com/postgis/postgis/releases/tag/2.5.5))
* TimescaleDB: **1.7.4** ([Release archive](https://github.com/timescale/timescaledb/releases/tag/1.7.4))

How to build:

Expand Down

0 comments on commit 7594025

Please sign in to comment.