From fded8f7ab7e99f28abd2e64e20bd14671164d427 Mon Sep 17 00:00:00 2001
From: a1012112796 <1012112796@qq.com>
Date: Thu, 18 Feb 2021 00:41:37 +0800
Subject: [PATCH] simplify logic

---
 Dockerfile | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 227adda..01ccf92 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,13 @@
 FROM golang:1.15
 
 # upgrade git to v2.30.1
-WORKDIR /go
-RUN apt-get update
-RUN apt-get install -y wget
-RUN wget "https://github.com/git/git/archive/v2.30.1.tar.gz"
-RUN tar -xvf v2.30.1.tar.gz
-WORKDIR /go/git-2.30.1
-RUN apt-get install -y libcurl4-gnutls-dev libexpat1-dev gettext libz-dev libssl-dev
-RUN make prefix=/usr all
-RUN make prefix=/usr install
-WORKDIR /go
-RUN rm -rf git-2.30.1 v2.30.1.tar.gz
-
+RUN curl -SL https://github.com/git/git/archive/v2.30.1.tar.gz \
+    | tar -xzv -C /go \
+    && apt-get update \
+    && apt-get install -y libcurl4-gnutls-dev libexpat1-dev gettext libz-dev libssl-dev \
+    && make -C /go/git-2.30.1 prefix=/usr all \
+    && make -C /go/git-2.30.1 prefix=/usr install \
+    && rm -rf /go/git-2.30.1 \
 # install git-lfs
-RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
-RUN apt-get install -y git-lfs
+    && curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash \
+    && apt-get install -y git-lfs