Skip to content

[SYCL][Devops] Fix containers build #16324

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

Closed
wants to merge 5 commits into from
Closed

[SYCL][Devops] Fix containers build #16324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df65c0f
[SYCL][Devops] Fix containers build
AlexeySachkov Dec 10, 2024
55bce58
Use sudo to install packages
AlexeySachkov Dec 11, 2024
355412e
Properly deal with &&
AlexeySachkov Dec 11, 2024
e0a71fc
More sudo to the god of sudo
AlexeySachkov Dec 11, 2024
ff6507d
Add sycl to sudoers for 2204 images
AlexeySachkov Dec 11, 2024
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 devops/containers/ubuntu2204_build.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ RUN groupadd -g 1001 sycl && useradd sycl -u 1001 -g 1001 -m -s /bin/bash
RUN usermod -aG video sycl
RUN usermod -aG irc sycl

# Allow sycl user to run as sudo
RUN echo "sycl ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers

COPY scripts/docker_entrypoint.sh /docker_entrypoint.sh

USER sycl
Expand Down
6 changes: 3 additions & 3 deletions devops/containers/ubuntu2204_intel_drivers.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ ENV DEBIAN_FRONTEND=noninteractive

ARG use_latest=true

RUN apt update && apt install -yqq wget
RUN sudo apt update && sudo apt install -yqq wget

COPY scripts/get_release.py /
COPY scripts/install_drivers.sh /
COPY dependencies.json /

RUN mkdir /runtimes
RUN sudo mkdir /runtimes
ENV INSTALL_LOCATION=/runtimes
RUN --mount=type=secret,id=github_token \
if [ "$use_latest" = "true" ]; then \
install_driver_opt=" --use-latest"; \
else \
install_driver_opt=" dependencies.json"; \
fi && \
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --all
GITHUB_TOKEN=$(cat /run/secrets/github_token) sudo /install_drivers.sh $install_driver_opt --all

COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh

Expand Down
9 changes: 0 additions & 9 deletions devops/containers/ubuntu2204_preinstalled.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@ ADD sycl_linux.tar.gz /opt/sycl/
ENV PATH /opt/sycl/bin:$PATH
ENV LD_LIBRARY_PATH /opt/sycl/lib:$LD_LIBRARY_PATH

# By default Ubuntu sets an arbitrary UID value, that is different from host
# system. When CI passes default UID value of 1001, some of LLVM tools fail to
# discover user home directory and fail a few LIT tests. Fixes UID and GID to
# 1001, that is used as default by GitHub Actions.
RUN groupadd -g 1001 sycl && useradd sycl -u 1001 -g 1001 -m -s /bin/bash
# Add sycl user to video/irc groups so that it can access GPU
RUN usermod -aG video sycl
RUN usermod -aG irc sycl

USER sycl

ENTRYPOINT ["/bin/bash", "/drivers_entrypoint.sh"]
Expand Down
6 changes: 3 additions & 3 deletions devops/containers/ubuntu2404_intel_drivers.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ ENV DEBIAN_FRONTEND=noninteractive

ARG use_latest=true

RUN apt update && apt install -yqq wget
RUN sudo apt update && sudo apt install -yqq wget

COPY scripts/get_release.py /
COPY scripts/install_drivers.sh /
COPY dependencies.json /

RUN mkdir /runtimes
RUN sudo mkdir /runtimes
ENV INSTALL_LOCATION=/runtimes
RUN --mount=type=secret,id=github_token \
if [ "$use_latest" = "true" ]; then \
install_driver_opt=" --use-latest"; \
else \
install_driver_opt=" dependencies.json"; \
fi && \
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --all
GITHUB_TOKEN=$(cat /run/secrets/github_token) sudo /install_drivers.sh $install_driver_opt --all

COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh

Expand Down
2 changes: 1 addition & 1 deletion devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM $base_image:$base_tag

ENV DEBIAN_FRONTEND=noninteractive

RUN apt update && apt install -yqq libllvm14
RUN sudo apt update && sudo apt install -yqq libllvm14

COPY scripts/get_release.py /
COPY scripts/install_drivers.sh /
Expand Down
Loading