Skip to content

Commit 69b3fa4

Browse files
udkyomhocouchbase
authored andcommitted
CBD-6558: Upgrade git in centos7-sgw-build
Change-Id: Ib731401140e352749c81f0f4a02ce7c5653b592b Reviewed-on: https://review.couchbase.org/c/build-infra/+/238865 Tested-by: Ming Ho <ming.ho@couchbase.com> Reviewed-by: Ming Ho <ming.ho@couchbase.com>
1 parent 263ae68 commit 69b3fa4

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

docker-stacks/mobile/mobile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ services:
141141
- jenkins
142142

143143
sgw-centos7:
144-
image: couchbasebuild/centos7-sgw-build:20260114
144+
image: couchbasebuild/centos7-sgw-build:20260120
145145
init: true
146146
user: couchbase
147147
environment:

docker/buildslaves/couchbase-sync-gateway/centos7/Dockerfile

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,42 @@ RUN groupadd -g1000 couchbase && \
3131
RUN yum install --setopt=keepcache=0 -y \
3232
binutils \
3333
curl \
34+
curl-devel \
3435
ed \
36+
expat-devel \
3537
gcc \
3638
gcc-c++ \
37-
git \
39+
gettext-devel \
3840
glibc.i686 \
3941
make \
4042
man \
4143
ncurses-devel \
4244
nss \
4345
numactl-devel \
4446
openssh-clients openssl-devel \
47+
perl-ExtUtils-MakeMaker \
4548
python-devel \
4649
redhat-lsb-core \
4750
rpm-build \
4851
rsync \
4952
ruby rubygems rubygem-rake \
5053
tar \
5154
unzip \
52-
which && \
55+
which \
56+
zlib-devel && \
5357
ln -s /usr/bin/python2.7 /usr/bin/python2.6
5458

59+
# * git
60+
ARG GIT_VERSION=2.30.9
61+
RUN mkdir /tmp/deploy && \
62+
curl --fail -L https://mirrors.edge.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz \
63+
-o /tmp/deploy/git.tar.gz && \
64+
cd /tmp/deploy && tar -xzf git.tar.gz && \
65+
cd git-${GIT_VERSION} && \
66+
make prefix=/usr/local all -j$(nproc) && \
67+
make prefix=/usr/local install && \
68+
rm -rf /tmp/deploy
69+
5570
# * Required for sgcollect_info
5671
RUN mkdir /tmp/deploy && \
5772
curl --fail --insecure https://bootstrap.pypa.io/pip/2.7/get-pip.py -o /tmp/deploy/get-pip.py && \

0 commit comments

Comments
 (0)