merge update scripts, fix git path

slc5-cms/Dockerfile

@@ -53,7 +53,6 @@ RUN     wget http://repository.egi.eu/sw/production/cas/1/current/repo-files/EGI
         yum install -y HEP_OSlibs_SL5 ca-policy-lcg ca-policy-egi-core wlcg-repo.noarch wlcg-voms-cms && \
         yum clean -y all
 
-ADD     git-test-inst /root/git-test-inst
 ADD     update_script.sh /root/update_script.sh
 RUN     chmod +x /root/update_script.sh && source /root/update_script.sh
 

slc5-cms/README.md

-Run `source download_sources.sh` to download the necessary packages to git-test-inst
\ No newline at end of file

slc5-cms/download_sources.sh

-#!/bin/bash
-
-export INSTALL_DIR=git-test-inst
-export GETTEXT_VERSION=gettext-0.20.1
-export CURL_VERSION=curl-7.65.0
-export OPENSSL_VERSION=openssl-1.1.1g
-export M4_VERSION=m4-1.4.18
-export AUTOCONF_VERSION=autoconf-2.69
-export GIT_VERSION=git-2.21.0
-export PERL_VERSION=perl-5.30.2
-mkdir ${INSTALL_DIR}
-cd ${INSTALL_DIR}
-
-wget https://ftp.gnu.org/pub/gnu/gettext/${GETTEXT_VERSION}.tar.gz
-wget https://curl.haxx.se/download/${CURL_VERSION}.tar.gz
-wget https://www.openssl.org/source/${OPENSSL_VERSION}.tar.gz
-wget https://mirrors.edge.kernel.org/pub/software/scm/git/${GIT_VERSION}.tar.gz
-wget https://ftp.gnu.org/gnu/m4/${M4_VERSION}.tar.gz
-wget https://ftp.gnu.org/gnu/autoconf/${AUTOCONF_VERSION}.tar.gz
-wget https://www.cpan.org/src/5.0/${PERL_VERSION}.tar.gz
-
-cd -
\ No newline at end of file

slc5-cms/entrypoint.sh

@@ -11,4 +11,7 @@ else
   echo "::: /cvmfs/cms.cern.ch/cmsset_default.sh not found/available"
 fi
 
+export LD_LIBRARY_PATH=/root/git-inst/lib:${LD_LIBRARY_PATH}
+export PATH=/root/git-inst/bin:${PATH}
+
 exec "$@"

slc5-cms/update_script.sh

 yum -y install make
 yum -y groupinstall 'Development Tools'
 
-export INSTALL_DIR=${PWD}/git-test-inst
+export INSTALL_DIR=${PWD}/git-inst
 export GETTEXT_VERSION=gettext-0.20.1
 export CURL_VERSION=curl-7.65.0
 export OPENSSL_VERSION=openssl-1.1.1g
@@ -11,14 +11,25 @@ export GIT_VERSION=git-2.21.0
 export PERL_VERSION=perl-5.30.2
 export LD_LIBRARY_PATH=${INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
 export PATH=${INSTALL_DIR}/bin:${PATH}
+mkdir ${INSTALL_DIR}
 cd ${INSTALL_DIR}
 
+wget http://ftp.gnu.org/pub/gnu/gettext/${GETTEXT_VERSION}.tar.gz
+wget ftp://mirrors.gethosted.online/curl-haxx/${CURL_VERSION}.tar.gz
+wget http://www.openssl.org/source/${OPENSSL_VERSION}.tar.gz
+wget http://mirrors.edge.kernel.org/pub/software/scm/git/${GIT_VERSION}.tar.gz
+wget http://ftp.gnu.org/gnu/m4/${M4_VERSION}.tar.gz
+wget http://ftp.gnu.org/gnu/autoconf/${AUTOCONF_VERSION}.tar.gz
+wget http://www.cpan.org/src/5.0/${PERL_VERSION}.tar.gz
+
 tar xzf ${GETTEXT_VERSION}.tar.gz
 cd ${GETTEXT_VERSION}
 ./configure --prefix=${INSTALL_DIR}
 make
 make install
 cd ..
+rm ${GETTEXT_VERSION}.tar.gz
+rm -rf ${GETTEXT_VERSION}
 
 tar -xzf ${PERL_VERSION}.tar.gz
 cd ${PERL_VERSION}
@@ -26,6 +37,8 @@ cd ${PERL_VERSION}
 make
 make install
 cd ..
+rm ${PERL_VERSION}.tar.gz
+rm -rf ${PERL_VERSION}
 
 tar xzf ${OPENSSL_VERSION}.tar.gz
 cd ${OPENSSL_VERSION}
@@ -33,22 +46,26 @@ CFLAGS=-fPIC ./config --prefix=${INSTALL_DIR} shared zlib
 make
 make install
 cd ..
+rm ${OPENSSL_VERSION}.tar.gz
+rm -rf ${OPENSSL_VERSION}
 
 tar xzf ${CURL_VERSION}.tar.gz
 cd ${CURL_VERSION}
 ./configure --with-ssl=${INSTALL_DIR} --prefix=${INSTALL_DIR}
 make
 make install
-#ldd ${INSTALL_DIR}/lib/libcurl.so.4.5.0 
 cd ..
+rm ${CURL_VERSION}.tar.gz
+rm -rf ${CURL_VERSION}
 
 tar xzf ${M4_VERSION}.tar.gz
 cd ${M4_VERSION}
 ./configure --prefix=${INSTALL_DIR}
 make -j16
 make install
-
 cd ..
+rm ${M4_VERSION}.tar.gz
+rm -rf ${M4_VERSION}
 
 tar xzf ${AUTOCONF_VERSION}.tar.gz
 cd ${AUTOCONF_VERSION}
@@ -56,6 +73,8 @@ cd ${AUTOCONF_VERSION}
 make -j16
 make install
 cd ..
+rm ${AUTOCONF_VERSION}.tar.gz
+rm -rf ${AUTOCONF_VERSION}
 
 tar xzf ${GIT_VERSION}.tar.gz 
 cd ${GIT_VERSION}
@@ -63,4 +82,6 @@ make configure
 ./configure --prefix=${INSTALL_DIR} --with-openssl=${INSTALL_DIR} --with-curl=${INSTALL_DIR}
 make -j16
 make install -i
-#ldd ${INSTALL_DIR}/libexec/git-core/git-remote-https
\ No newline at end of file
+cd ..
+rm ${GIT_VERSION}.tar.gz
+rm -rf ${GIT_VERSION}