Merge pull request #1015 from chuckatkins/add-git-lfs-to-ci-images

Add git-lfs to CI docker images
ornladios · Nov 27, 2018 · 703441d · 703441d
2 parents 1a534b8 + 1314a5e
commit 703441d
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 31 deletions.
diff --git a/scripts/circle/el7-gnu7-ohpc/Dockerfile b/scripts/circle/el7-gnu7-ohpc/Dockerfile
@@ -26,9 +26,13 @@ RUN export uid=1001 gid=1001 && \
     echo "adios2:x:${uid}:" >> /etc/group && \
     chown ${uid}:${gid} -R /home/adios2
 
+# Install and initialize git-lfs
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash && \
+    yum install -y git-lfs && \
+    runuser -l adios2 -c 'git lfs install'
+
 # Misc cleanup of unneeded files
-RUN rm -rfv /tmp/* \
-  && rm -rf /var/cache/yum
+RUN rm -rfv /tmp/* /var/cache/yum
 
 USER adios2
 ENV HOME /home/adios2

diff --git a/scripts/circle/el7-gnu7-openmpi-ohpc/Dockerfile b/scripts/circle/el7-gnu7-openmpi-ohpc/Dockerfile
@@ -39,9 +39,13 @@ RUN export uid=1001 gid=1001 && \
     echo "adios2:x:${uid}:" >> /etc/group && \
     chown ${uid}:${gid} -R /home/adios2
 
+# Install and initialize git-lfs
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash && \
+    yum install -y git-lfs && \
+    runuser -l adios2 -c 'git lfs install'
+
 # Misc cleanup of unneeded files
-RUN rm -rfv /tmp/* \
-  && rm -rf /var/cache/yum
+RUN rm -rfv /tmp/* /var/cache/yum
 
 USER adios2
 ENV HOME /home/adios2

diff --git a/scripts/circle/el7-intel18-ohpc/Dockerfile b/scripts/circle/el7-intel18-ohpc/Dockerfile
@@ -27,7 +27,7 @@ RUN yum clean all
 # Install the CMake binary
 WORKDIR /opt/cmake/3.6.3
 RUN curl -L https://cmake.org/files/v3.6/cmake-3.6.3-Linux-x86_64.tar.gz | \
-  tar --strip-components=1 -xz
+    tar --strip-components=1 -xz
 
 # Create a non-root user to run the builds/tests
 RUN export uid=1001 gid=1001 && \
@@ -36,16 +36,21 @@ RUN export uid=1001 gid=1001 && \
     echo "adios2:x:${uid}:" >> /etc/group && \
     chown ${uid}:${gid} -R /home/adios2
 
+# Install and initialize git-lfs
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash && \
+    yum install -y git-lfs && \
+    runuser -l adios2 -c 'git lfs install'
+
 # Misc cleanup of unneeded files
-RUN rm -rfv /tmp/* \
-  && rm -rfv \
-    /opt/intel/man \
-    /opt/intel/documentation_2018 \
-    /opt/intel/ide_support_2018 \
-    /opt/intel/samples_2018 \
-    /opt/intel/compilers_and_libraries_2018.2.199/linux/mkl/benchmarks \
-    /opt/intel/compilers_and_libraries_2018.2.199/linux/mkl/examples \
-  && rm -rf /var/cache/yum
+RUN rm -rfv \
+        /tmp/* \
+        /opt/intel/man \
+        /opt/intel/documentation_2018 \
+        /opt/intel/ide_support_2018 \
+        /opt/intel/samples_2018 \
+        /opt/intel/compilers_and_libraries_2018.2.199/linux/mkl/benchmarks \
+        /opt/intel/compilers_and_libraries_2018.2.199/linux/mkl/examples \
+        /var/cache/yum
 
 USER adios2
 ENV HOME /home/adios2

diff --git a/scripts/circle/el7-intel18-openmpi-ohpc/Dockerfile b/scripts/circle/el7-intel18-openmpi-ohpc/Dockerfile
@@ -46,16 +46,21 @@ RUN export uid=1001 gid=1001 && \
     echo "adios2:x:${uid}:" >> /etc/group && \
     chown ${uid}:${gid} -R /home/adios2
 
+# Install and initialize git-lfs
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash && \
+    yum install -y git-lfs && \
+    runuser -l adios2 -c 'git lfs install'
+
 # Misc cleanup of unneeded files
-RUN rm -rfv /tmp/* \
-  && rm -rfv \
-    /opt/intel/man \
-    /opt/intel/documentation_2018 \
-    /opt/intel/ide_support_2018 \
-    /opt/intel/samples_2018 \
-    /opt/intel/compilers_and_libraries_2018.2.199/linux/mkl/benchmarks \
-    /opt/intel/compilers_and_libraries_2018.2.199/linux/mkl/examples \
-  && rm -rf /var/cache/yum
+RUN rm -rfv \
+        /tmp/* \
+        /opt/intel/man \
+        /opt/intel/documentation_2018 \
+        /opt/intel/ide_support_2018 \
+        /opt/intel/samples_2018 \
+        /opt/intel/compilers_and_libraries_2018.2.199/linux/mkl/benchmarks \
+        /opt/intel/compilers_and_libraries_2018.2.199/linux/mkl/examples \
+        /var/cache/yum
 
 USER adios2
 ENV HOME /home/adios2

diff --git a/scripts/circle/el7/Dockerfile b/scripts/circle/el7/Dockerfile
@@ -2,7 +2,7 @@ FROM centos:centos7
 
 # Install core dev packages
 RUN yum -y install gcc gcc-c++ gcc-gfortran git make curl file valgrind vim \
-        gdb zlib zlib-devel bzip2 bzip2-libs bzip2-devel python-devel numpy \
+        gdb zlib zlib-devel bzip2 bzip2-libs bzip2-devel python-devel numpy
 RUN yum -y install epel-release
 RUN yum -y install zeromq-devel hdf5 hdf5-devel
 
@@ -21,9 +21,13 @@ RUN export uid=1001 gid=1001 && \
     echo "adios2:x:${uid}:" >> /etc/group && \
     chown ${uid}:${gid} -R /home/adios2
 
+# Install and initialize git-lfs
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash && \
+    yum install -y git-lfs && \
+    runuser -l adios2 -c 'git lfs install'
+
 # Misc cleanup of unneeded files
-RUN rm -rfv /tmp/* \
-  && rm -rf /var/cache/yum
+RUN rm -rfv /tmp/* /var/cache/yum
 
 USER adios2
 ENV HOME /home/adios2

diff --git a/scripts/circle/fedora-openmpi-ubsan/Dockerfile b/scripts/circle/fedora-openmpi-ubsan/Dockerfile
@@ -3,7 +3,8 @@ FROM fedora:latest
 # Install core dev packages
 RUN dnf -y install gcc gcc-c++ gcc-gfortran cmake git make curl file patch \
         zlib-devel bzip2-devel openmpi-devel hdf5-openmpi-devel vim valgrind \
-        python3-devel python3-numpy python3-mpi4py-openmpi zeromq-devel libubsan
+        python3-devel python3-numpy python3-mpi4py-openmpi zeromq-devel \
+        libubsan
 
 # Patch the installed Lmod to properly deal with a CMake shell
 RUN curl https://github.com/TACC/Lmod/commit/516a986322ac462876218ce140214824f47f5887.patch | patch -p 2 /usr/share/lmod/7.5.16/libexec/tcl2lua.tcl
@@ -18,9 +19,13 @@ RUN export uid=1001 gid=1001 && \
     echo "adios2:x:${uid}:" >> /etc/group && \
     chown ${uid}:${gid} -R /home/adios2
 
+# Install and initialize git-lfs
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash && \
+    dnf install -y git-lfs && \
+    runuser -l adios2 -c 'git lfs install'
+
 # Misc cleanup of unneeded files
-RUN rm -rfv /tmp/* \
-  && rm -rf /var/cache/dnf
+RUN rm -rfv /tmp/* /var/cache/dnf
 
 USER adios2
 ENV HOME /home/adios2

diff --git a/scripts/circle/fedora-ubsan/Dockerfile b/scripts/circle/fedora-ubsan/Dockerfile
@@ -15,9 +15,13 @@ RUN export uid=1001 gid=1001 && \
     echo "adios2:x:${uid}:" >> /etc/group && \
     chown ${uid}:${gid} -R /home/adios2
 
+# Install and initialize git-lfs
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash && \
+    dnf install -y git-lfs && \
+    runuser -l adios2 -c 'git lfs install'
+
 # Misc cleanup of unneeded files
-RUN rm -rfv /tmp/* \
-  && rm -rf /var/cache/dnf
+RUN rm -rfv /tmp/* /var/cache/dnf
 
 USER adios2
 ENV HOME /home/adios2

diff --git a/scripts/circle/suse-pgi-openmpi/Dockerfile b/scripts/circle/suse-pgi-openmpi/Dockerfile
@@ -51,6 +51,11 @@ RUN export uid=1001 gid=1001 && \
     echo "adios2:x:${uid}:" >> /etc/group && \
     chown ${uid}:${gid} -R /home/adios2
 
+# Install and initialize git-lfs
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash && \
+    zypper in -y git-lfs && \
+    runuser -l adios2 -c 'git lfs install'
+
 # Misc cleanup of unneeded files
 RUN rm -rf /tmp/* \
   && zypper clean

diff --git a/scripts/circle/suse-pgi/Dockerfile b/scripts/circle/suse-pgi/Dockerfile
@@ -43,6 +43,11 @@ RUN export uid=1001 gid=1001 && \
     echo "adios2:x:${uid}:" >> /etc/group && \
     chown ${uid}:${gid} -R /home/adios2
 
+# Install and initialize git-lfs
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash && \
+    zypper in -y git-lfs && \
+    runuser -l adios2 -c 'git lfs install'
+
 # Misc cleanup of unneeded files
 RUN rm -rf /tmp/* \
   && zypper clean