Skip to content

Commit 30783da

Browse files
authored
bump python versions and use docker slim versions (#1661)
1 parent 74db326 commit 30783da

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

tests/Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
ARG PYTHON_IMAGE
2-
FROM ${PYTHON_IMAGE}
2+
FROM ${PYTHON_IMAGE}-slim
33

44
RUN apt-get -qq update && apt-get -qq -y --no-install-recommends install \
5+
build-essential \
56
ca-certificates \
67
curl \
8+
gnupg2 \
9+
libmariadb-dev \
10+
libpq-dev \
11+
make \
712
netcat \
813
odbc-postgresql \
914
unixodbc-dev \
1015
freetds-dev \
11-
libmemcached-dev &&\
12-
rm -rf /var/lib/apt/lists/*
16+
libmemcached-dev \
17+
&& rm -rf /var/lib/apt/lists/*
1318

1419
# connection to ha.pool.sks-keyservers.net fails sometimes, so let's retry with couple different servers
1520
RUN for server in $(shuf -e ha.pool.sks-keyservers.net \

tests/scripts/docker/black.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ docker_pip_cache="/tmp/cache/pip"
77

88
cd tests
99

10-
docker build --build-arg PYTHON_IMAGE=python:3.6 -t python-linters .
10+
docker build --build-arg PYTHON_IMAGE=python:3.8 -t python-linters .
1111
docker run \
1212
-e LOCAL_USER_ID=$UID \
1313
-e PIP_CACHE=${docker_pip_cache} \

tests/scripts/docker/flake8.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ docker_pip_cache="/tmp/cache/pip"
77

88
cd tests
99

10-
docker build --build-arg PYTHON_IMAGE=python:3.6 -t lint_flake8 .
10+
docker build --build-arg PYTHON_IMAGE=python:3.8 -t lint_flake8 .
1111
docker run \
1212
-e LOCAL_USER_ID=$UID \
1313
-e PIP_CACHE=${docker_pip_cache} \

tests/scripts/docker/isort.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ docker_pip_cache="/tmp/cache/pip"
77

88
cd tests
99

10-
docker build --build-arg PYTHON_IMAGE=python:3.6 -t python-linters .
10+
docker build --build-arg PYTHON_IMAGE=python:3.8 -t python-linters .
1111
docker run \
1212
-e LOCAL_USER_ID=$UID \
1313
-e PIP_CACHE=${docker_pip_cache} \

0 commit comments

Comments
 (0)