diff --git a/build.assets/Dockerfile-centos7-assets b/build.assets/Dockerfile-centos7-assets index 6f9adf8ab5086..74550d4a19c91 100644 --- a/build.assets/Dockerfile-centos7-assets +++ b/build.assets/Dockerfile-centos7-assets @@ -70,20 +70,20 @@ FROM centos-devtoolset as custom-packages RUN useradd --user-group --create-home --shell=/bin/bash mockbuild # Recompile and install libelf with -fPIC. -RUN mkdir -p /opt/custom-builds && cd /opt && \ +RUN mkdir -p /opt/custom-packages && cd /opt && \ yumdownloader --source elfutils-libelf-devel-static && \ yum-builddep -y elfutils-libelf-devel-static && \ rpmbuild --rebuild --define "optflags `rpm -E %{optflags}` -fPIC" elfutils-*.src.rpm && \ if [ "${TARGETARCH}" = "arm64" ]; then export TARGETARCH="aarch64"; fi && \ - cp /root/rpmbuild/RPMS/${TARGETARCH}/elfutils-libelf-devel-static-*.el7.${TARGETARCH}.rpm /opt/custom-builds/ + cp /root/rpmbuild/RPMS/${TARGETARCH}/elfutils-libelf-devel-static-*.el7.${TARGETARCH}.rpm /opt/custom-packages/ # Recompile and install zlib with -fPIC. -RUN mkdir -p /opt/custom-builds && cd /opt && \ +RUN mkdir -p /opt/custom-packages && cd /opt && \ yumdownloader --source zlib-static && \ yum-builddep -y zlib-static && \ rpmbuild --rebuild --define "optflags `rpm -E %{optflags}` -fPIC" zlib-*.src.rpm && \ if [ "${TARGETARCH}" = "arm64" ]; then export TARGETARCH="aarch64"; fi && \ - cp /root/rpmbuild/RPMS/${TARGETARCH}/zlib-static-*.el7.${TARGETARCH}.rpm /opt/custom-builds/ + cp /root/rpmbuild/RPMS/${TARGETARCH}/zlib-static-*.el7.${TARGETARCH}.rpm /opt/custom-packages/ # Create the final image with Clang and custom builds only. We're using this Docker image as a tar.gz # mainly because we want to keep our artifacts on GitHub, and GH doesn't support blobs, only Docker images. @@ -93,4 +93,4 @@ FROM scratch AS buildbox-centos7-assets COPY --from=clang12 /opt/llvm /opt/llvm/ # Copy custom packages into the final image. -COPY --from=custom-packages /opt/custom-builds /opt/custom-builds/ +COPY --from=custom-packages /opt/custom-packages /opt/custom-packages/