Skip to content

Commit a0c2a4e

Browse files
yansun1996sajmera-pensando
authored andcommitted
[Fix] Make GIM driver dockerfile to fix broken dependency
Signed-off-by: yansun1996 <[email protected]>
1 parent 9897af6 commit a0c2a4e

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed
File renamed without changes.

internal/kmmmodule/dockerfiles/vGPUHostGIM.ubuntu renamed to internal/kmmmodule/dockerfiles/DockerfileTemplate.ubuntu.gim

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ RUN apt-get update && \
1212
autoconf \
1313
automake \
1414
wget \
15-
linux-headers-${KERNEL_FULL_VERSION} && \
15+
bc \
16+
linux-headers-${KERNEL_FULL_VERSION} \
17+
linux-modules-extra-${KERNEL_FULL_VERSION} && \
1618
apt-get clean
1719

1820
RUN wget https://github.com/amd/MxGPU-Virtualization/releases/download/mainline%2F${DRIVERS_VERSION}/gim-dkms_${DRIVERS_VERSION}_all.deb && \
19-
dpkg -i gim-dkms_${DRIVERS_VERSION}_all.deb && \
21+
apt-get install --fix-broken -y ./gim-dkms_${DRIVERS_VERSION}_all.deb && \
2022
rm gim-dkms_${DRIVERS_VERSION}_all.deb
2123

2224
RUN depmod ${KERNEL_FULL_VERSION}

internal/kmmmodule/kmmmodule.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ const (
8787
var (
8888
//go:embed dockerfiles/DockerfileTemplate.ubuntu
8989
dockerfileTemplateUbuntu string
90-
//go:embed dockerfiles/driversDockerfile.txt
90+
//go:embed dockerfiles/DockerfileTemplate.coreos
9191
buildOcDockerfile string
9292
//go:embed devdockerfiles/devdockerfile.txt
9393
dockerfileDevTemplateUbuntu string
94-
//go:embed dockerfiles/vGPUHostGIM.ubuntu
95-
dockerfileTemplateUbuntuVGPUHost string
94+
//go:embed dockerfiles/DockerfileTemplate.ubuntu.gim
95+
dockerfileTemplateGIMUbuntu string
9696
)
9797

9898
//go:generate mockgen -source=kmmmodule.go -package=kmmmodule -destination=mock_kmmmodule.go KMMModuleAPI
@@ -189,7 +189,7 @@ func resolveDockerfile(cmName string, devConfig *amdv1alpha1.DeviceConfig) (stri
189189
dockerfileTemplate = dockerfileTemplateUbuntu
190190
switch devConfig.Spec.Driver.DriverType {
191191
case utils.DriverTypeVFPassthrough:
192-
dockerfileTemplate = dockerfileTemplateUbuntuVGPUHost
192+
dockerfileTemplate = dockerfileTemplateGIMUbuntu
193193
}
194194
driverLabel, present := driverLabels[version]
195195
if !present {

0 commit comments

Comments
 (0)