Group Docker build steps for libgcc-4.8.5-44.el7.aarch64.rpm together

Expotential108 · May 5, 2022 · 80f5cff · 80f5cff
1 parent 392ab78
commit 80f5cff
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/builders/Dockerfile.centos7 b/builders/Dockerfile.centos7
@@ -7,7 +7,7 @@ RUN yum -y update \
   && yum -y install epel-release \
   && yum -y install gcc-aarch64-linux-gnu gcc-c++-aarch64-linux-gnu \
   && yum install -y http://springdale.princeton.edu/data/springdale/7/x86_64/os/Computational/glibc-aarch64-linux-gnu-2.24-2.sdl7.2.noarch.rpm \
-  && yum install -y http://springdale.princeton.edu/data/springdale/7/x86_64/os/Computational/glibc-aarch64-linux-gnu-devel-2.24-2.sdl7.2.noarch.rpm 
+  && yum install -y http://springdale.princeton.edu/data/springdale/7/x86_64/os/Computational/glibc-aarch64-linux-gnu-devel-2.24-2.sdl7.2.noarch.rpm
 
 # GET FROM https://github.com/rust-lang/docker-rust-nightly
 ENV RUSTUP_HOME=/usr/local/rustup \
@@ -41,8 +41,9 @@ RUN chmod +rx /.cargo
 COPY guest/cargo-config /.cargo/config
 
 # Copy the missing library libgcc_s.so that gcc does not provide
-RUN wget http://mirror.centos.org/altarch/7/os/aarch64/Packages/libgcc-4.8.5-44.el7.aarch64.rpm
-RUN rpm2cpio libgcc-4.8.5-44.el7.aarch64.rpm | cpio -idmv
-RUN cp /code/lib64/libgcc_s-4.8.5-20150702.so.1 /usr/lib/gcc/aarch64-linux-gnu/4.8.5/libgcc_s.so
+RUN wget http://mirror.centos.org/altarch/7/os/aarch64/Packages/libgcc-4.8.5-44.el7.aarch64.rpm \
+  && rpm2cpio libgcc-4.8.5-44.el7.aarch64.rpm | cpio -idmv \
+  && cp /code/lib64/libgcc_s-4.8.5-20150702.so.1 /usr/lib/gcc/aarch64-linux-gnu/4.8.5/libgcc_s.so \
+  && rm libgcc-*.el7.aarch64.rpm
 
 CMD ["/opt/build_linux.sh"]