Skip to content

Commit

Permalink
Fix typo in Dockerfile-centos7-assets -- s/custom-builds/custom-pac…
Browse files Browse the repository at this point in the history
…kages/ (#35758)

`/opt/custom-builds` should be `/opt/custom-packages`

Oops, I renamed this and forgot to update it everywhere before landing.
  • Loading branch information
reedloden authored Dec 14, 2023
1 parent b4e5e91 commit 4d3680a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions build.assets/Dockerfile-centos7-assets
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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/

0 comments on commit 4d3680a

Please sign in to comment.