Skip to content

Commit bb4710a

Browse files
authored
Merge pull request #61 from emqx/chore-fix-git-bogus-format-error-in-el7
[4.4] fix git bogus format error
2 parents 43a7d87 + 936d336 commit bb4710a

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

el7/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,14 @@ RUN /install-openssl11.sh
4545
WORKDIR /
4646

4747
ENV GIT_VERSION=2.38.1 DEVELOPER_CFLAGS='-std=gnu99'
48-
RUN curl -L -o /tmp/git.tar.gz "https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz" \
48+
# - have to uninstall stock git to cleanup all git backend files,
49+
# otherwise git from the newer version may encounter
50+
# an error like "bogus format in GIT_CONFIG_PARAMETERS"
51+
# - gnu99 flag is to address https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5948
52+
# - libcurl-devel is needed to support clone from https remotes
53+
RUN yum remove -y git \
54+
&& yum install -y libcurl-devel \
55+
&& curl -L -o /tmp/git.tar.gz "https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz" \
4956
&& tar zxf /tmp/git.tar.gz -C /tmp \
5057
&& cd "/tmp/git-${GIT_VERSION}/" \
5158
&& make configure \

0 commit comments

Comments
 (0)