From d72d01c8d08fd727a93dba373b94b938c2164783 Mon Sep 17 00:00:00 2001 From: Dolsy Smith Date: Tue, 12 Oct 2021 12:34:35 -0400 Subject: [PATCH 1/3] Python base image changed --- docker/base/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 146312c..5f65a66 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -1,5 +1,6 @@ # Python 3.6 -FROM python@sha256:81782ff0fadf910a9f13747608f0d93e8938cbbdc1e50dc8c88e4e1ab8d9e7b2 +#FROM python@sha256:81782ff0fadf910a9f13747608f0d93e8938cbbdc1e50dc8c88e4e1ab8d9e7b2 +FROM python:3.9.7-bullseye MAINTAINER Social Feed Manager ARG DEBIAN_FRONTEND=noninteractive From 316983a62cbe600f801fa1a85a25a3fc01d94743 Mon Sep 17 00:00:00 2001 From: Dolsy Smith Date: Mon, 18 Oct 2021 09:14:10 -0400 Subject: [PATCH 2/3] Base image to Python 3.8:buster, updates kombu for compatibility with 3.8 --- docker/base/Dockerfile | 2 +- requirements/common.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 5f65a66..0729efb 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -1,6 +1,6 @@ # Python 3.6 #FROM python@sha256:81782ff0fadf910a9f13747608f0d93e8938cbbdc1e50dc8c88e4e1ab8d9e7b2 -FROM python:3.9.7-bullseye +FROM python:3.8.12-buster MAINTAINER Social Feed Manager ARG DEBIAN_FRONTEND=noninteractive diff --git a/requirements/common.txt b/requirements/common.txt index 34f0324..79c4314 100644 --- a/requirements/common.txt +++ b/requirements/common.txt @@ -5,7 +5,7 @@ mock==2.0.0 vcrpy==2.0.1 python-dateutil==2.7.5 # Consumer -kombu==4.0.2 +kombu==4.6.11 librabbitmq==2.0.0 # Harvester petl==1.2.0 diff --git a/setup.py b/setup.py index 98798ab..ac0da2a 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ scripts=['sfmutils/stream_consumer.py', 'sfmutils/find_warcs.py'], install_requires=['pytz==2019.3', 'requests==2.22.0', - 'kombu==4.0.2', + 'kombu==4.6.11', 'librabbitmq==2.0.0', 'warcio==1.5.3', 'iso8601==0.1.12', From 567683c45027a529409bd5c8fcf0d830827b8f32 Mon Sep 17 00:00:00 2001 From: Dolsy Smith Date: Wed, 20 Oct 2021 10:02:04 -0400 Subject: [PATCH 3/3] Removed reference to older image --- docker/base/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 0729efb..d7806b8 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -1,5 +1,3 @@ -# Python 3.6 -#FROM python@sha256:81782ff0fadf910a9f13747608f0d93e8938cbbdc1e50dc8c88e4e1ab8d9e7b2 FROM python:3.8.12-buster MAINTAINER Social Feed Manager