move to git 2.12

move to git 2.12

.devcontainer/Dockerfile

@@ -8,7 +8,7 @@ USER root
 WORKDIR /root
 
 # Install some additional packages.
-RUN yum -y install which sclo-git25 wget tar atlas-devel libuuid-devel texinfo \
+RUN yum -y install which sclo-git212 wget tar atlas-devel libuuid-devel texinfo \
            python2-pip redhat-lsb-core libX11-devel libXpm-devel libXft-devel  \
            libXext-devel openssl-devel glibc-devel rpm-build libcurl-devel     \
            mesa-libGL-devel libaio && \
@@ -20,13 +20,13 @@ RUN echo '%wheel	ALL=(ALL)	NOPASSWD: ALL' >> /etc/sudoers && \
     usermod -aG wheel atlas
 
 # Copy the interactive environment setup scripts in place.
-COPY atlas_prompt.sh setup_atlas.sh enable_sclo_git25.sh /etc/profile.d/
+COPY atlas_prompt.sh setup_atlas.sh enable_sclo_git212.sh /etc/profile.d/
 # Add the message of the day instructions for the image.
 COPY motd /etc/
 
 # Install flake8 python linter
 RUN pip install flake8 six
-RUN scl enable sclo-git25 'pip install git+https://:@gitlab.cern.ch:8443/atlas/atlasexternals.git#subdirectory=External/flake8_atlas'
+RUN scl enable sclo-git212 'pip install git+https://:@gitlab.cern.ch:8443/atlas/atlasexternals.git#subdirectory=External/flake8_atlas'
 
 # Switch to the ATLAS account.
 USER atlas

.devcontainer/enable_sclo_git212.sh

+# Enable git 2.12 from Software Collections
+source scl_source enable sclo-git212

.devcontainer/enable_sclo_git25.sh

-# Enable git 2.5 from Software Collections
-source scl_source enable sclo-git25