[ci] Pass IP for repo.radeon.com as docker buildargs
[ROCm/hip commit: 7ba09c4137]
Bu işleme şunda yer alıyor:
Sağlanmış
+3
-3
@@ -76,10 +76,10 @@ def docker_build_image( String platform, String source_hip_rel, String from_imag
|
||||
|
||||
// Docker 17.05 introduced the ability to use ARG values in FROM statements
|
||||
// Docker inspect failing on FROM statements with ARG https://issues.jenkins-ci.org/browse/JENKINS-44836
|
||||
//build_image = docker.build( "${project}/${build_image_name}:latest", "--pull -f docker/${dockerfile_name} --build-arg user_uid=${user_uid} --build-arg base_image=${from_image} ." )
|
||||
//build_image = docker.build( "${project}/${build_image_name}:latest", "--pull -f docker/${dockerfile_name} --build-arg REPO_RADEON=10.255.8.5 --build-arg user_uid=${user_uid} --build-arg base_image=${from_image} ." )
|
||||
|
||||
// JENKINS-44836 workaround
|
||||
sh "docker build -t ${project}/${build_image_name}:latest --pull -f docker/${dockerfile_name} --build-arg user_uid=${user_uid} --build-arg base_image=${from_image} ."
|
||||
sh "docker build -t ${project}/${build_image_name}:latest --pull -f docker/${dockerfile_name} --build-arg REPO_RADEON=10.255.8.5 --build-arg user_uid=${user_uid} --build-arg base_image=${from_image} ."
|
||||
build_image = docker.image( "${project}/${build_image_name}:latest" )
|
||||
}
|
||||
}
|
||||
@@ -316,4 +316,4 @@ nvcc:
|
||||
|
||||
// Not pushing an Nvidia based HiP to artifactory at this time
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
# Parameters related to building hip
|
||||
ARG base_image
|
||||
ARG REPO_RADEON=$REPO_RADEON
|
||||
|
||||
FROM ${base_image}
|
||||
MAINTAINER Kent Knox <kent.knox@amd>
|
||||
@@ -9,8 +10,8 @@ COPY *.deb /tmp/
|
||||
|
||||
# Install the debian package
|
||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl \
|
||||
&& curl -sL http://repo.radeon.com/rocm/apt/debian/rocm.gpg.key | apt-key add - \
|
||||
&& echo deb [arch=amd64] http://repo.radeon.com/rocm/apt/debian/ xenial main | tee /etc/apt/sources.list.d/rocm.list \
|
||||
&& curl -sL http://$REPO_RADEON/rocm/apt/debian/rocm.gpg.key | apt-key add - \
|
||||
&& echo deb [arch=amd64] http://$REPO_RADEON/rocm/apt/debian/ xenial main | tee /etc/apt/sources.list.d/rocm.list \
|
||||
&& apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --allow-unauthenticated -y \
|
||||
/tmp/hip_base-*.deb \
|
||||
/tmp/hip_hcc-*.deb \
|
||||
|
||||
Yeni konuda referans
Bir kullanıcı engelle