From 91cb3f8ef7aaabb3f91497371fa4d31ae990a569 Mon Sep 17 00:00:00 2001
From: mritd <mritd@linux.com>
Date: Tue, 13 Apr 2021 20:05:10 +0800
Subject: [PATCH] chore(docker): update docker file, add ci support

update docker file, add ci support

Signed-off-by: mritd <mritd@linux.com>
---
 .github/workflows/docker.yaml | 43 +++++++++++++++++++++++++++++++++++
 Dockerfile                    | 10 +++-----
 2 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 .github/workflows/docker.yaml

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
new file mode 100644
index 0000000..a169e18
--- /dev/null
+++ b/.github/workflows/docker.yaml
@@ -0,0 +1,43 @@
+name: Build Docker Image
+
+on:
+  push:
+    branches:
+      - 'v*'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out
+        uses: actions/checkout@v2
+
+      - name: Get tag
+        uses: olegtarasov/get-tag@v2
+        id: tagName
+
+      - name: Get time
+        uses: gerred/actions/current-time@master
+        id: current-time
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: tobyxdd/hysteria:latest,tobyxdd/hysteria:${{ env.GIT_TAG_NAME }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/Dockerfile b/Dockerfile
index c023ea0..bb675a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14.7-alpine3.12 AS builder
+FROM golang:alpine AS builder
 
 LABEL maintainer="mritd <mritd@linux.com>"
 
@@ -19,14 +19,10 @@ ENV COMMIT ${COMMIT}
 ENV TIMESTAMP ${TIMESTAMP}
 ENV GOPROXY ${GOPROXY}
 
-# go mod is always enabled
-ENV GO111MODULE on
-
 COPY . /go/src/github.com/tobyxdd/hysteria
 
 WORKDIR /go/src/github.com/tobyxdd/hysteria/cmd
 
-# TODO: Is it necessary to remove "-w -s" to add debugging information?
 RUN set -ex \
     && go build -o /go/bin/hysteria -ldflags \
         "-w -s -X 'main.appVersion=${VERSION}' \
@@ -34,7 +30,7 @@ RUN set -ex \
         -X 'main.appDate=${TIMESTAMP}'"
 
 # multi-stage builds to create the final image
-FROM alpine:3.12 AS dist
+FROM alpine AS dist
 
 LABEL maintainer="mritd <mritd@linux.com>"
 
@@ -50,4 +46,4 @@ RUN set -ex \
 
 COPY --from=builder /go/bin/hysteria /usr/local/bin/hysteria
 
-ENTRYPOINT ["hysteria"]
\ No newline at end of file
+ENTRYPOINT ["hysteria"]