Skip to content

Commit 2745592

Browse files
author
Rui Yang
committed
update ubuntu build to install git from jammy default repo
Signed-off-by: Rui Yang <ruiya@vmware.com>
1 parent 6973b64 commit 2745592

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,8 @@ Run the tests with the following commands for both `alpine` and `ubuntu` images:
369369

370370
```sh
371371
docker build -t git-resource --target tests -f dockerfiles/alpine/Dockerfile .
372-
docker build -t git-resource --target tests -f dockerfiles/ubuntu/Dockerfile .
372+
docker build -t registry-image-resource --target tests -f dockerfiles/ubuntu/Dockerfile --build-arg base_image=ubuntu:latest .
373+
373374
```
374375

375376
#### Note about the integration tests

dockerfiles/ubuntu/Dockerfile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
ARG base_image=ubuntu:bionic
1+
ARG base_image
22

33
FROM ${base_image} AS resource
44

55
RUN apt update && apt upgrade -y -o Dpkg::Options::="--force-confdef"
66
RUN apt install -y --no-install-recommends \
77
curl \
8+
git \
9+
git-lfs \
810
gnupg \
911
gzip \
1012
jq \
@@ -16,14 +18,6 @@ RUN apt install -y --no-install-recommends \
1618
libstdc++6 \
1719
software-properties-common
1820

19-
RUN apt-add-repository ppa:git-core/ppa \
20-
&& apt update \
21-
&& apt install -y git \
22-
&& rm -rf /var/lib/apt/lists/*
23-
24-
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
25-
RUN apt install -y git-lfs
26-
2721
WORKDIR /root
2822
RUN git clone https://github.com/proxytunnel/proxytunnel.git && \
2923
cd proxytunnel && \

0 commit comments

Comments
 (0)