Skip to content

Commit

Permalink
[Backport 8.8] Fix CI user's PATH to include pip-installed executables (
Browse files Browse the repository at this point in the history
#2250)

Co-authored-by: Josh Mock <[email protected]>
  • Loading branch information
github-actions[bot] and JoshMock authored Jul 6, 2023
1 parent c7cf98d commit ccca348
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions .ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ARG BUILDER_UID=1000
ARG BUILDER_GID=1000
ENV BUILDER_USER elastic
ENV BUILDER_GROUP elastic
ENV PATH="${PATH}:/var/lib/elastic/.local/bin"

# Create user
RUN groupadd --system -g ${BUILDER_GID} ${BUILDER_GROUP} \
Expand Down
6 changes: 4 additions & 2 deletions .ci/run-repository.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,16 @@ echo -e "\033[1m>>>>> Build [elastic/elasticsearch-py container] >>>>>>>>>>>>>>>
docker build \
--file .ci/Dockerfile \
--tag elastic/elasticsearch-py \
--build-arg PYTHON_VERSION=${PYTHON_VERSION} \
--build-arg "PYTHON_VERSION=${PYTHON_VERSION}" \
--build-arg "BUILDER_UID=$(id -u)" \
--build-arg "BUILDER_GID=$(id -g)" \
.

echo -e "\033[1m>>>>> Run [elastic/elasticsearch-py container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"

mkdir -p junit
docker run \
-u "$(id -u)" \
-u "$(id -u):$(id -g)" \
--network=${network_name} \
--env "STACK_VERSION=${STACK_VERSION}" \
--env "ELASTICSEARCH_URL=${elasticsearch_url}" \
Expand Down

0 comments on commit ccca348

Please sign in to comment.