From 38435084bde985eee5afa3deea707ae2a5054a4c Mon Sep 17 00:00:00 2001
From: Ruggero Turra <ruggero.turra@cern.ch>
Date: Tue, 11 Apr 2023 19:19:28 +0200
Subject: [PATCH] move to git 2.12
move to git 2.12
---
.devcontainer/Dockerfile | 6 +++---
.devcontainer/enable_sclo_git212.sh | 2 ++
.devcontainer/enable_sclo_git25.sh | 2 --
3 files changed, 5 insertions(+), 5 deletions(-)
create mode 100644 .devcontainer/enable_sclo_git212.sh
delete mode 100644 .devcontainer/enable_sclo_git25.sh
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index a89893eaf1e5..7ee5ab48ed07 100644
--- a/.devcontainer/Dockerfile
+++ b/.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
diff --git a/.devcontainer/enable_sclo_git212.sh b/.devcontainer/enable_sclo_git212.sh
new file mode 100644
index 000000000000..1d6a7851db53
--- /dev/null
+++ b/.devcontainer/enable_sclo_git212.sh
@@ -0,0 +1,2 @@
+# Enable git 2.12 from Software Collections
+source scl_source enable sclo-git212
diff --git a/.devcontainer/enable_sclo_git25.sh b/.devcontainer/enable_sclo_git25.sh
deleted file mode 100644
index db4972e03d9c..000000000000
--- a/.devcontainer/enable_sclo_git25.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Enable git 2.5 from Software Collections
-source scl_source enable sclo-git25
--
GitLab