From 2745592901e63a8e170b153eeb2d18bbda9e6b05 Mon Sep 17 00:00:00 2001
From: Rui Yang <ruiya@vmware.com>
Date: Fri, 9 Dec 2022 01:50:36 -0500
Subject: [PATCH] update ubuntu build to install git from jammy default repo

Signed-off-by: Rui Yang <ruiya@vmware.com>
---
 README.md                     |  3 ++-
 dockerfiles/ubuntu/Dockerfile | 12 +++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 46a825b..c348a5f 100644
--- a/README.md
+++ b/README.md
@@ -369,7 +369,8 @@ Run the tests with the following commands for both `alpine` and `ubuntu` images:
 
 ```sh
 docker build -t git-resource --target tests -f dockerfiles/alpine/Dockerfile .
-docker build -t git-resource --target tests -f dockerfiles/ubuntu/Dockerfile .
+docker build -t registry-image-resource --target tests -f dockerfiles/ubuntu/Dockerfile --build-arg base_image=ubuntu:latest .
+
 ```
 
 #### Note about the integration tests
diff --git a/dockerfiles/ubuntu/Dockerfile b/dockerfiles/ubuntu/Dockerfile
index fee0c82..4f195db 100644
--- a/dockerfiles/ubuntu/Dockerfile
+++ b/dockerfiles/ubuntu/Dockerfile
@@ -1,10 +1,12 @@
-ARG base_image=ubuntu:bionic
+ARG base_image
 
 FROM ${base_image} AS resource
 
 RUN apt update && apt upgrade -y -o Dpkg::Options::="--force-confdef"
 RUN apt install -y --no-install-recommends \
     curl \
+    git \
+    git-lfs \
     gnupg \
     gzip \
     jq \
@@ -16,14 +18,6 @@ RUN apt install -y --no-install-recommends \
     libstdc++6 \
     software-properties-common
 
-RUN apt-add-repository ppa:git-core/ppa \
-  && apt update \
-  && apt install -y git \
-  && rm -rf /var/lib/apt/lists/*
-
-RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
-RUN apt install -y git-lfs
-
 WORKDIR /root
 RUN git clone https://github.com/proxytunnel/proxytunnel.git && \
     cd proxytunnel && \