Skip to content

Commit

Permalink
update ubuntu build to install git from jammy default repo
Browse files Browse the repository at this point in the history
Signed-off-by: Rui Yang <ruiya@vmware.com>
  • Loading branch information
Rui Yang committed Dec 9, 2022
1 parent 6973b64 commit 2745592
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 3 additions & 9 deletions dockerfiles/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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 && \
Expand Down

0 comments on commit 2745592

Please sign in to comment.