Skip to content

Commit

Permalink
Fix git installation path - Docker CentOS 7 image (gravitational#21884)
Browse files Browse the repository at this point in the history
My previous PR gravitational#21660 broke the git installation path, as `git` compiles in the `--prefix` provided during configuration. Using`DESTDIR` with `make install` instead of `--prefix` copies the file in the intermediate container with the correct path.
  • Loading branch information
jakule authored Feb 15, 2023
1 parent e62ff82 commit 5f87676
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build.assets/Dockerfile-centos7
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ RUN wget https://github.com/git/git/archive/refs/tags/v2.39.1.tar.gz && \
tar xf v2.39.1.tar.gz && \
cd git-2.39.1/ && \
scl enable ${DEVTOOLSET} "make configure && \
./configure --prefix=/opt/git && \
./configure --prefix=/usr/local && \
make -j6 all && \
make install"
DESTDIR=/opt/git make install"

# Create an alias to the assets image. Ref: https://github.com/docker/for-mac/issues/2155
ARG BUILDARCH
Expand Down

0 comments on commit 5f87676

Please sign in to comment.