Skip to content

Commit

Permalink
bump python versions and use docker slim versions (elastic#1661)
Browse files Browse the repository at this point in the history
  • Loading branch information
v1v committed Oct 11, 2022
1 parent 74db326 commit 30783da
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
11 changes: 8 additions & 3 deletions tests/Dockerfile
@@ -1,15 +1,20 @@
ARG PYTHON_IMAGE
FROM ${PYTHON_IMAGE}
FROM ${PYTHON_IMAGE}-slim

RUN apt-get -qq update && apt-get -qq -y --no-install-recommends install \
build-essential \
ca-certificates \
curl \
gnupg2 \
libmariadb-dev \
libpq-dev \
make \
netcat \
odbc-postgresql \
unixodbc-dev \
freetds-dev \
libmemcached-dev &&\
rm -rf /var/lib/apt/lists/*
libmemcached-dev \
&& rm -rf /var/lib/apt/lists/*

# connection to ha.pool.sks-keyservers.net fails sometimes, so let's retry with couple different servers
RUN for server in $(shuf -e ha.pool.sks-keyservers.net \
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/docker/black.sh
Expand Up @@ -7,7 +7,7 @@ docker_pip_cache="/tmp/cache/pip"

cd tests

docker build --build-arg PYTHON_IMAGE=python:3.6 -t python-linters .
docker build --build-arg PYTHON_IMAGE=python:3.8 -t python-linters .
docker run \
-e LOCAL_USER_ID=$UID \
-e PIP_CACHE=${docker_pip_cache} \
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/docker/flake8.sh
Expand Up @@ -7,7 +7,7 @@ docker_pip_cache="/tmp/cache/pip"

cd tests

docker build --build-arg PYTHON_IMAGE=python:3.6 -t lint_flake8 .
docker build --build-arg PYTHON_IMAGE=python:3.8 -t lint_flake8 .
docker run \
-e LOCAL_USER_ID=$UID \
-e PIP_CACHE=${docker_pip_cache} \
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/docker/isort.sh
Expand Up @@ -7,7 +7,7 @@ docker_pip_cache="/tmp/cache/pip"

cd tests

docker build --build-arg PYTHON_IMAGE=python:3.6 -t python-linters .
docker build --build-arg PYTHON_IMAGE=python:3.8 -t python-linters .
docker run \
-e LOCAL_USER_ID=$UID \
-e PIP_CACHE=${docker_pip_cache} \
Expand Down

0 comments on commit 30783da

Please sign in to comment.