Skip to content

Commit a807792

Browse files
committed
update git installation on centos 7 to git 2.x
motivation: centos 7 ships with git 1.x which is too old for the toolchain usage chages: * use RHL software collections to install git 2.x * add symlink since collections install in /opt (TBD better solution)
1 parent ff51ee6 commit a807792

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

nightly-main/centos/7/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ FROM centos:7
22
LABEL maintainer="Swift Infrastructure <[email protected]>"
33
LABEL description="Docker Container for the Swift programming language"
44

5+
RUN yum install -y centos-release-scl-rh
6+
57
RUN yum install shadow-utils.x86_64 -y \
68
binutils \
79
gcc \
8-
git \
10+
rh-git227-git \
911
glibc-static \
1012
libbsd-devel \
1113
libcurl-devel \
@@ -20,6 +22,8 @@ RUN yum install shadow-utils.x86_64 -y \
2022
sqlite \
2123
zlib-devel
2224

25+
RUN ln -s /opt/rh/rh-git227/root/bin/git /usr/bin/git
26+
2327
RUN sed -i -e 's/\*__block/\*__libc_block/g' /usr/include/unistd.h
2428

2529
# Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little

0 commit comments

Comments
 (0)