Use docker --pull by default, bump to python 3.10 (#386)

Use docker build --pull by default, unless NO_REFRESH=1 is set
(this is the same param as in the primary OMT repo)

Also, upgrade to the latest stable Python ver 3.10

Author: nyurik

Dockerfile

@@ -31,7 +31,7 @@ RUN set -eux ;\
 
 
 # Build osmborder
-FROM python:3.8 as c-builder
+FROM python:3.10 as c-builder
 ARG OSMBORDER_REV=e3ae8f7a2dcdcd6dc80abab4679cb5edb7dc6fa5
 
 RUN set -eux ;\
@@ -60,7 +60,7 @@ RUN set -eux ;\
 
 
 # Primary image
-FROM python:3.8-slim
+FROM python:3.10-slim
 LABEL maintainer="Yuri Astrakhan <[email protected]>"
 
 ARG PG_MAJOR=12

Makefile

@@ -16,6 +16,12 @@ DOCKER_OPTS  ?= -i --rm -u $$(id -u $${USER}):$$(id -g $${USER})
 # Optionally pass in extra parameters to the docker build command
 DOCKER_BUILD_EXTRAS ?=
 
+ifneq ($(strip $(NO_REFRESH)),)
+	@echo "Skipping docker image refresh"
+else
+  DOCKER_BUILD_EXTRAS := $(DOCKER_BUILD_EXTRAS) --pull
+endif
+
 # Current dir is shared with the docker, allowing scripts to write to the dir as a current user
 WORKDIR      ?= $$( pwd -P )
 RUN_CMD := docker run ${DOCKER_OPTS} -v "$(WORKDIR):/tileset"

requirements.txt

@@ -1,5 +1,11 @@
 ## This list is also used by setup.py - install_requires
 ## But there it removes all version restrictions
+## To upgrade this list, run
+##     make bash
+##     pip install pip-upgrader
+##     /home/openmaptiles/.local/bin/pip-upgrade --skip-virtualenv-check
+##     cat requirements.txt
+##     <copy-paste the shown content to this file>
 aiohttp==3.7.4
 ascii_graph==1.5.1
 asyncpg==0.24.0
@@ -8,11 +14,11 @@ betterproto==1.2.5
 dataclasses-json==0.5.6
 deprecated==1.2.13
 docopt-ng==0.7.2
-flake8==3.9.2
-flake8-quotes==3.3.0
+flake8==4.0.1
+flake8-quotes==3.3.1
 graphviz==0.17
 psycopg2-binary==2.9.1
-pyyaml==5.4.1
+pyyaml==6.0
 requests==2.26.0
 tabulate==0.8.9
 tornado==6.1