Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make independent python virtualenvs in docker #14903

Merged
merged 2 commits into from
Dec 3, 2019
Merged

Make independent python virtualenvs in docker #14903

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24821ee
Make independent python virtualenvs in docker
jsoriano Dec 3, 2019
4e03237
Pillow 6.2.1 is not supported by python version in Travis
jsoriano Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions auditbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ RUN \
&& apt-get install -y --no-install-recommends \
python-pip \
virtualenv \
python3 \
librpm-dev \
&& rm -rf /var/lib/apt/lists/*

ENV PYTHON_ENV=/tmp/python-env

RUN pip install --upgrade pip
RUN pip install --upgrade setuptools
RUN pip install --upgrade docker-compose==1.23.2
3 changes: 3 additions & 0 deletions filebeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ RUN \
python-pip \
rsync \
virtualenv \
python3 \
libpcap-dev \
&& rm -rf /var/lib/apt/lists/*

ENV PYTHON_ENV=/tmp/python-env

RUN pip install --upgrade pip
RUN pip install --upgrade setuptools
RUN pip install --upgrade docker-compose==1.23.2
4 changes: 3 additions & 1 deletion heartbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
RUN set -x && \
apt-get update && \
apt-get install -y --no-install-recommends \
netcat python-pip virtualenv && \
netcat python-pip virtualenv python3 && \
apt-get clean

ENV PYTHON_ENV=/tmp/python-env

RUN pip install --upgrade pip
RUN pip install --upgrade setuptools
RUN pip install --upgrade docker-compose==1.23.2
Expand Down
4 changes: 3 additions & 1 deletion journalbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ MAINTAINER Noémi Ványi <noemi.vanyi@elastic.co>
RUN set -x && \
apt-get update && \
apt-get install -y --no-install-recommends \
python-pip virtualenv libsystemd-dev libc6-dev-i386 gcc-arm-linux-gnueabi && \
python-pip virtualenv python3 libsystemd-dev libc6-dev-i386 gcc-arm-linux-gnueabi && \
jsoriano marked this conversation as resolved.
Show resolved Hide resolved
apt-get clean

ENV PYTHON_ENV=/tmp/python-env

RUN pip install --upgrade setuptools

# Setup work environment
Expand Down
2 changes: 1 addition & 1 deletion libbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
RUN set -x && \
apt-get update && \
apt-get install -y --no-install-recommends \
netcat python-pip virtualenv libpcap-dev && \
netcat python-pip virtualenv python3 libpcap-dev && \
apt-get clean

ENV PYTHON_ENV=/tmp/python-env
Expand Down
2 changes: 1 addition & 1 deletion libbeat/scripts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ system-tests: prepare-tests ${BEAT_NAME}.test python-env
.PHONY: system-tests-environment
system-tests-environment: ## @testing Runs the system tests inside a virtual environment. This can be run on any docker-machine (local, remote)
system-tests-environment: prepare-tests build-image
${DOCKER_COMPOSE} run -e INTEGRATION_TESTS=1 -e TESTING_ENVIRONMENT=${TESTING_ENVIRONMENT} -e DOCKER_COMPOSE_PROJECT_NAME=${DOCKER_COMPOSE_PROJECT_NAME} beat make system-tests
${DOCKER_COMPOSE} run -e INTEGRATION_TESTS=1 -e TESTING_ENVIRONMENT=${TESTING_ENVIRONMENT} -e DOCKER_COMPOSE_PROJECT_NAME=${DOCKER_COMPOSE_PROJECT_NAME} -e PYTHON_EXE=${PYTHON_EXE} beat make system-tests

.PHONY: fast-system-tests
fast-system-tests: ## @testing Runs system tests without coverage reports and in parallel
Expand Down
1 change: 1 addition & 0 deletions libbeat/tests/system/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ nose==1.3.7
nose-timer==0.7.1
pycodestyle==2.4.0
PyYAML==4.2b1
Pillow==6.2.1
redis==2.10.6
requests==2.20.0
six==1.11.0
Expand Down
3 changes: 3 additions & 0 deletions metricbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ RUN \
netcat \
python-pip \
virtualenv \
python3 \
&& rm -rf /var/lib/apt/lists/*

ENV PYTHON_ENV=/tmp/python-env

RUN pip install --upgrade pip
RUN pip install --upgrade setuptools
RUN pip install --upgrade docker-compose==1.23.2
Expand Down
4 changes: 3 additions & 1 deletion x-pack/functionbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ MAINTAINER Pier-Hugues Pellerin <ph@elastic.co>
RUN set -x && \
apt-get update && \
apt-get install -y --no-install-recommends \
netcat python-pip rsync virtualenv && \
netcat python-pip rsync virtualenv python3 && \
apt-get clean

ENV PYTHON_ENV=/tmp/python-env

RUN pip install --upgrade setuptools

# Setup work environment
Expand Down
4 changes: 3 additions & 1 deletion x-pack/libbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ FROM golang:1.13.4
RUN set -x && \
apt-get update && \
apt-get install -y --no-install-recommends \
netcat python-pip rsync virtualenv && \
netcat python-pip rsync virtualenv python3 && \
apt-get clean

ENV PYTHON_ENV=/tmp/python-env

RUN pip install --upgrade setuptools

# Setup work environment
Expand Down