From 5e0d00e976a0f96ce626fabb978bf71bb0a705f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2019 20:04:22 +0000 Subject: [PATCH 1/5] Bump pillow from 4.3.0 to 6.2.0 Bumps [pillow](https://github.com/python-pillow/Pillow) from 4.3.0 to 6.2.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/4.3.0...6.2.0) Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b1a7366b..d7f2c767 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,7 +32,7 @@ openapi-codec==1.1.7 packaging==16.8 piexif==1.0.13 pilkit==2.0 -Pillow==4.3.0 +Pillow==6.2.0 pip-autoremove==0.9.0 psycopg2==2.7.4 psycopg2-binary==2.7.4 From 7a482950be765100af9579f728565fca81fb33ef Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Tue, 22 Oct 2019 19:09:14 -0400 Subject: [PATCH 2/5] Install lsb-release --- db/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db/Dockerfile b/db/Dockerfile index bcf40e6f..16c4d542 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -3,7 +3,8 @@ MAINTAINER Piero Toffanin ENV POSTGIS_MAJOR 2.3 -RUN echo "deb http://deb.debian.org/debian "$(lsb_release --codename | cut -f2)"-backports main" >> /etc/apt/sources.list \ +RUN apt-get install -y lsb-release && + echo "deb http://deb.debian.org/debian "$(lsb_release --codename | cut -f2)"-backports main" >> /etc/apt/sources.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ From 11a0b37cafc2c75fad12a599f9b4f137b8bfb44a Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Tue, 22 Oct 2019 19:10:34 -0400 Subject: [PATCH 3/5] Dockerfile fix --- db/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/Dockerfile b/db/Dockerfile index 16c4d542..abd4c752 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -3,8 +3,8 @@ MAINTAINER Piero Toffanin ENV POSTGIS_MAJOR 2.3 -RUN apt-get install -y lsb-release && - echo "deb http://deb.debian.org/debian "$(lsb_release --codename | cut -f2)"-backports main" >> /etc/apt/sources.list \ +RUN apt-get install -y lsb-release \ + && echo "deb http://deb.debian.org/debian "$(lsb_release --codename | cut -f2)"-backports main" >> /etc/apt/sources.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ From d2a76d3da25d777d5bc21bc824a90b3dc1209a59 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Tue, 22 Oct 2019 19:21:57 -0400 Subject: [PATCH 4/5] Replace lsb-release with cat command --- db/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/Dockerfile b/db/Dockerfile index abd4c752..e043553c 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -3,8 +3,8 @@ MAINTAINER Piero Toffanin ENV POSTGIS_MAJOR 2.3 -RUN apt-get install -y lsb-release \ - && echo "deb http://deb.debian.org/debian "$(lsb_release --codename | cut -f2)"-backports main" >> /etc/apt/sources.list \ +RUN source /etc/os-release \ + && echo "deb http://deb.debian.org/debian "$VERSION_CODENAME"-backports main" >> /etc/apt/sources.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ From 90a07d3ed485009c35e6a4a340d4409dfdbfe935 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Tue, 22 Oct 2019 19:27:34 -0400 Subject: [PATCH 5/5] Source --> . --- db/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/Dockerfile b/db/Dockerfile index e043553c..f0fe8605 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER Piero Toffanin ENV POSTGIS_MAJOR 2.3 -RUN source /etc/os-release \ +RUN . /etc/os-release \ && echo "deb http://deb.debian.org/debian "$VERSION_CODENAME"-backports main" >> /etc/apt/sources.list \ && apt-get update \ && apt-get install -y --no-install-recommends \