From eac93c83c7661a592b8d674a9a76ef24db926e95 Mon Sep 17 00:00:00 2001
From: xjasonlyu <xjasonlyu@gmail.com>
Date: Sat, 21 May 2022 22:27:08 +0800
Subject: [PATCH] update build chain

---
 Dockerfile | 8 ++++----
 Makefile   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 92ed22e..8a43423 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,15 +3,15 @@ FROM golang:alpine AS builder
 WORKDIR /src
 COPY . /src
 
-RUN CGO_ENABLED=0 go build -v -ldflags '-w -s -buildid=' -trimpath \
-    -o javtube-server cmd/server/main.go
+RUN apk add --update --no-cache --no-progress make git \
+    && make server
 
 FROM alpine:latest
 LABEL org.opencontainers.image.source="https://github.com/javtube/javtube-sdk-go"
 
-RUN apk --no-cache --no-progress add ca-certificates tzdata
+COPY --from=builder /src/build/javtube-server .
 
-COPY --from=builder /src/javtube-server .
+RUN apk add --update --no-cache --no-progress ca-certificates tzdata
 
 ENV GIN_MODE=release
 ENV PORT=8080
diff --git a/Makefile b/Makefile
index 1fd3055..e453f4a 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ SERVER_CODE := cmd/server/main.go
 BUILD_DIR     := build
 BUILD_TAGS    :=
 BUILD_FLAGS   := -v
-BUILD_COMMIT  := $(shell git rev-parse --short HEAD)
-BUILD_VERSION := $(shell git describe --abbrev=0 --tags HEAD)
+#BUILD_COMMIT  := $(shell git rev-parse --short HEAD)
+#BUILD_VERSION := $(shell git describe --abbrev=0 --tags HEAD)
 
 CGO_ENABLED := 0
 GO111MODULE := on