Skip to content

Commit d5c3123

Browse files
committed
[Devops] Small containers clean-up
- get_release.py is unused and likely can be removed - we don't test fpga anymore, so I guess we don't need to install the runtime, so change all -> igfx, cpu. May be this part of script may be removed as well. - there is some leftover after drivers install. Do not download .deb.gpg assets & also remove .ddeb
1 parent d4ad1ea commit d5c3123

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

devops/containers/ubuntu2204_intel_drivers.Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ USER root
99

1010
RUN apt update && apt install -yqq wget
1111

12-
COPY scripts/get_release.py /
1312
COPY scripts/install_drivers.sh /
1413
COPY dependencies.json /
1514

1615
RUN mkdir /runtimes
1716
ENV INSTALL_LOCATION=/runtimes
1817
RUN --mount=type=secret,id=github_token \
19-
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --all
18+
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --igfx --cpu
2019

2120
COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh
2221

devops/containers/ubuntu2404_intel_drivers.Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ USER root
99

1010
RUN apt update && apt install -yqq wget
1111

12-
COPY scripts/get_release.py /
1312
COPY scripts/install_drivers.sh /
1413
COPY dependencies.json /
1514

1615
RUN mkdir /runtimes
1716
ENV INSTALL_LOCATION=/runtimes
1817
RUN --mount=type=secret,id=github_token \
19-
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --all
18+
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --igfx --cpu
2019

2120
COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh
2221

devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ USER root
99

1010
RUN apt update && apt install -yqq libllvm14 libllvm15 libz3-4
1111

12-
COPY scripts/get_release.py /
1312
COPY scripts/install_drivers.sh /
1413
COPY dependencies.json /
1514
COPY dependencies-igc-dev.json /
@@ -18,7 +17,7 @@ RUN mkdir /runtimes
1817
ENV INSTALL_LOCATION=/runtimes
1918
RUN --mount=type=secret,id=github_token \
2019
install_driver_opt="dependencies.json dependencies-igc-dev.json --use-dev-igc"; \
21-
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --all
20+
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --igfx --cpu
2221

2322
COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh
2423

devops/scripts/install_drivers.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ InstallIGFX () {
127127
| grep -v "u18" \
128128
| wget -qi -
129129
get_release oneapi-src/level-zero $L0_TAG \
130-
| grep ".*$UBUNTU_VER.*deb" \
130+
| grep ".*$UBUNTU_VER.*deb$" \
131131
| wget -qi -
132-
dpkg -i --force-all *.deb && rm *.deb *.sum
132+
dpkg -i --force-all *.deb && rm *.deb *.ddeb *.sum
133133
mkdir -p /usr/local/lib/igc/
134134
echo "$IGC_TAG" > /usr/local/lib/igc/IGCTAG.txt
135135
if [ "$IS_IGC_DEV" == "Yes" ]; then

0 commit comments

Comments
 (0)