Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DNM] test manpages from docker/cli gha-validate pr #620

Closed
wants to merge 2 commits into from
Closed

[DNM] test manpages from docker/cli gha-validate pr #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a84090
[DNM] test manpages from docker/cli gha-validate pr
crazy-max Feb 25, 2022
2404572
Install recent Git version on CentOS 7
crazy-max Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ VERSION?=0.0.1-dev

# DOCKER_CLI_REPO and DOCKER_ENGINE_REPO define the source repositories to clone
# the source from. These can be overridden to build from a fork.
DOCKER_CLI_REPO ?= https://github.com/docker/cli.git
DOCKER_CLI_REPO ?= https://github.com/crazy-max/docker-cli.git
DOCKER_ENGINE_REPO ?= https://github.com/docker/docker.git
DOCKER_SCAN_REPO ?= https://github.com/docker/scan-cli-plugin.git

Expand All @@ -34,7 +34,7 @@ DOCKER_SCAN_REPO ?= https://github.com/docker/scan-cli-plugin.git
#
# For other situations, specify DOCKER_CLI_REF and/or DOCKER_ENGINE_REF separately.
REF ?= HEAD
DOCKER_CLI_REF ?= $(REF)
DOCKER_CLI_REF ?= gha-validate
DOCKER_ENGINE_REF ?= $(REF)
DOCKER_SCAN_REF ?= v0.16.0

Expand Down
20 changes: 20 additions & 0 deletions rpm/centos-7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,26 @@ ARG SUITE
ENV DISTRO=${DISTRO}
ENV SUITE=${SUITE}

# Use recent Git version
ARG GIT_VERSION="2.30.0"
RUN yum install -y \
curl-devel \
expat-devel \
gettext-devel \
openssl-devel \
perl-CPAN \
perl-devel \
wget \
zlib-devel \
&& yum --setopt=group_package_types=mandatory,default,optional groupinstall -y "Development Tools" \
&& wget https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz -O git.tar.gz \
&& tar -zxf git.tar.gz \
&& cd git-* \
&& make prefix=/usr/local all \
&& make prefix=/usr/local install \
&& rm -rf /git* \
&& git --version
Comment on lines +21 to +39
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok needs to update Git for CentOS 7. I prefer to build from source as some third party repositories are not reliable and trusted. It takes a few minutes to build Git, so I think it's fine.


# In aarch64 (arm64) images, the altarch repo is specified as repository, but
# failing, so replace the URL.
RUN if [ -f /etc/yum.repos.d/CentOS-Sources.repo ]; then sed -i 's/altarch/centos/g' /etc/yum.repos.d/CentOS-Sources.repo; fi
Expand Down