Skip to content

Commit d093684

Browse files
committed
fixup: venv
1 parent ba53d28 commit d093684

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ENV USER {{ server_user }}
55
ENV JOBS {{ server_jobs | default(ansible_processor_vcpus) }}
66
ENV SHELL /bin/bash
77
ENV HOME /home/{{ server_user }}
8-
ENV PATH /usr/lib/ccache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
8+
ENV PATH /usr/local/venv/bin:/usr/lib/ccache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
99
ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe
1010
ENV NODE_TEST_DIR /home/{{ server_user }}/tmp
1111
ENV OSTYPE linux-gnu
@@ -28,6 +28,7 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
2828
libtool \
2929
automake
3030

31+
RUN python3 -m venv /usr/local/venv
3132
RUN pip3 install tap2junit=={{ tap2junit_version }}
3233

3334
RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}

ansible/roles/docker/templates/ubuntu2404_armv7l.Dockerfile.j2

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ENV USER {{ server_user }}
55
ENV JOBS {{ server_jobs | default(ansible_processor_vcpus) }}
66
ENV SHELL /bin/bash
77
ENV HOME /home/{{ server_user }}
8-
ENV PATH /usr/lib/ccache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
8+
ENV PATH /usr/local/venv/bin:/usr/lib/ccache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
99
ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe
1010
ENV NODE_TEST_DIR /home/{{ server_user }}/tmp
1111
ENV OSTYPE linux-gnu
@@ -25,6 +25,7 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \
2525
python-is-python3 \
2626
libfontconfig1
2727

28+
RUN python3 -m venv /usr/local/venv
2829
RUN pip3 install tap2junit=={{ tap2junit_version }}
2930

3031
RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}

ansible/roles/docker/templates/ubuntu2404_sharedlibs.Dockerfile.j2

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ENV USER {{ server_user }}
55
ENV JOBS {{ server_jobs | default(ansible_processor_vcpus) }}
66
ENV SHELL /bin/bash
77
ENV HOME /home/{{ server_user }}
8-
ENV PATH /usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
8+
ENV PATH /usr/local/venv/bin:/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
99
ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe
1010
ENV NODE_TEST_DIR /home/{{ server_user }}/tmp
1111
ENV OSTYPE linux-gnu
@@ -30,6 +30,7 @@ RUN apt-get update && apt-get install apt-utils -y && \
3030
libtool \
3131
automake
3232

33+
RUN python3 -m venv /usr/local/venv
3334
RUN pip3 install tap2junit=={{ tap2junit_version }}
3435

3536
RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}

0 commit comments

Comments
 (0)