Skip to content

Commit

Permalink
Merge pull request #44 from hackoregon/update-to-stretch
Browse files Browse the repository at this point in the history
Update to stretch
  • Loading branch information
znmeb authored Apr 28, 2018
2 parents 8f9c945 + b4dc84c commit b251b21
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 40 deletions.
30 changes: 10 additions & 20 deletions DOCKERFILE.api.development
Original file line number Diff line number Diff line change
@@ -1,31 +1,21 @@
FROM python:3.6
FROM python:3.6.5-stretch
MAINTAINER Brian H. Grant <[email protected]> & "M. Edward (Ed) Borasky <[email protected]>
ENV PYTHONUNBUFFERED 1

# Add Geo libraries
RUN mkdir /code
WORKDIR /code
RUN apt-get update && apt-get install -y \
binutils \
gdal-bin \
libgeos-dev \
libproj-dev \
&& rm -rf /var/lib/apt/lists/*

# add PostgreSQL client libraries
# add required Debian packages
# https://docs.djangoproject.com/en/2.0/ref/contrib/gis/install/geolibs/
RUN apt-get update \
&& apt-get install -qqy --no-install-recommends \
gnupg \
&& apt-get clean
RUN mkdir -p /etc/apt/sources.list.d/
COPY jessie/pgdg.list.jessie /etc/apt/sources.list.d/pgdg.list
RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
&& apt-get update \
&& apt-get install -qqy --no-install-recommends \
libpq-dev \
binutils \
gdal-bin \
libproj-dev \
postgresql-client-9.6 \
&& apt-get clean

# create and populate /code
RUN mkdir /code
WORKDIR /code

COPY /requirements/* /code/
RUN pip install -r development.txt

Expand Down
30 changes: 10 additions & 20 deletions DOCKERFILE.api.production
Original file line number Diff line number Diff line change
@@ -1,31 +1,21 @@
FROM python:3.6
FROM python:3.6.5-stretch
MAINTAINER Brian H. Grant <[email protected]> & "M. Edward (Ed) Borasky <[email protected]>
ENV PYTHONUNBUFFERED 1

# Add Geo libraries
RUN mkdir /code
WORKDIR /code
RUN apt-get update && apt-get install -y \
binutils \
gdal-bin \
libgeos-dev \
libproj-dev \
&& rm -rf /var/lib/apt/lists/*

# add PostgreSQL client libraries
# add required Debian packages
# https://docs.djangoproject.com/en/2.0/ref/contrib/gis/install/geolibs/
RUN apt-get update \
&& apt-get install -qqy --no-install-recommends \
gnupg \
&& apt-get clean
RUN mkdir -p /etc/apt/sources.list.d/
COPY jessie/pgdg.list.jessie /etc/apt/sources.list.d/pgdg.list
RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
&& apt-get update \
&& apt-get install -qqy --no-install-recommends \
libpq-dev \
binutils \
gdal-bin \
libproj-dev \
postgresql-client-9.6 \
&& apt-get clean

# create and populate /code
RUN mkdir /code
WORKDIR /code

COPY /requirements/* /code/
RUN pip install -r production.txt

Expand Down

0 comments on commit b251b21

Please sign in to comment.