From 0259973024c7895fe6d3b6af5963dd8f2fb35b5e Mon Sep 17 00:00:00 2001 From: Kurt Griffiths Date: Tue, 18 May 2021 11:08:45 -0600 Subject: [PATCH] chore: update docker images --- docker/Makefile | 17 ++++++++++++----- ...nch_py37.Dockerfile => bench_py3.Dockerfile} | 2 +- ...n.Dockerfile => bench_py3_cython.Dockerfile} | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) rename docker/{bench_py37.Dockerfile => bench_py3.Dockerfile} (89%) rename docker/{bench_py37_cython.Dockerfile => bench_py3_cython.Dockerfile} (95%) diff --git a/docker/Makefile b/docker/Makefile index 06e2267c3..ba0cd6f68 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,10 +1,17 @@ +FALCON_VERSION=$(shell sudo docker run -it falconry/falcon-bench:py3 python3 -c 'import falcon; import sys; sys.stdout.write(falcon.__version__)') + all: build-benchmark-images build-benchmark-images: - sudo docker pull python:3.7-slim - sudo docker pull python:3.7 + sudo docker pull python:3.8-slim + sudo docker pull python:3.8 sudo docker pull pypy:3-slim - sudo docker build -t falconry/falcon-bench:py37 -f bench_py37.Dockerfile ./ - sudo docker build -t falconry/falcon-bench:py37-cython -f bench_py37_cython.Dockerfile ./ - sudo docker build -t falconry/falcon-bench:pypy3 -f bench_pypy3.Dockerfile ./ + sudo docker build --no-cache -t falconry/falcon-bench:${FALCON_VERSION}-py38 -f bench_py3.Dockerfile ./ + sudo docker build --no-cache -t falconry/falcon-bench:${FALCON_VERSION}-py38-cython -f bench_py3_cython.Dockerfile ./ + sudo docker build --no-cache -t falconry/falcon-bench:${FALCON_VERSION}-pypy3 -f bench_pypy3.Dockerfile ./ + +push: + sudo docker push falconry/falcon-bench:${FALCON_VERSION}-py38 + sudo docker push falconry/falcon-bench:${FALCON_VERSION}-py38-cython + sudo docker push falconry/falcon-bench:${FALCON_VERSION}-pypy3 diff --git a/docker/bench_py37.Dockerfile b/docker/bench_py3.Dockerfile similarity index 89% rename from docker/bench_py37.Dockerfile rename to docker/bench_py3.Dockerfile index c7eaf3d1f..2d5af5ffb 100644 --- a/docker/bench_py37.Dockerfile +++ b/docker/bench_py3.Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.7-slim +FROM python:3.8-slim MAINTAINER Falcon Framework Maintainers RUN pip install --no-cache-dir falcon diff --git a/docker/bench_py37_cython.Dockerfile b/docker/bench_py3_cython.Dockerfile similarity index 95% rename from docker/bench_py37_cython.Dockerfile rename to docker/bench_py3_cython.Dockerfile index 9ee79e220..e69311b56 100644 --- a/docker/bench_py37_cython.Dockerfile +++ b/docker/bench_py3_cython.Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.7 +FROM python:3.8 MAINTAINER Falcon Framework Maintainers RUN pip install cython