From 008933f304bd2f2d4ecbe400ae46c0963db123bd Mon Sep 17 00:00:00 2001
From: fatedier <fatedier@gmail.com>
Date: Wed, 23 Sep 2020 14:54:40 +0800
Subject: [PATCH] typo fix

---
 .github/workflows/build-and-push-image.yml | 2 +-
 Makefile                                   | 5 +++--
 dockerfiles/Dockerfile-for-frpc            | 8 +++++---
 dockerfiles/Dockerfile-for-frps            | 8 +++++---
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
index 0894228..b11fe48 100644
--- a/.github/workflows/build-and-push-image.yml
+++ b/.github/workflows/build-and-push-image.yml
@@ -105,7 +105,7 @@ jobs:
         run: |
           echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
           docker push $TAG_FRPC
-          docker push $TAG_FRPC
+          docker push $TAG_FRPS
       # push to gpr
       -
         name: Publish to GPR
diff --git a/Makefile b/Makefile
index b3035dd..dab01d9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 export PATH := $(GOPATH)/bin:$(PATH)
 export GO111MODULE=on
+LDFLAGS := -s -w
 
 all: fmt build
 
@@ -19,10 +20,10 @@ fmt:
 	go fmt ./...
 
 frps:
-	go build -o bin/frps ./cmd/frps
+	env CGO_ENABLED=0 go build -ldflags "$(LDFLAGS)" -o bin/frps ./cmd/frps
 
 frpc:
-	go build -o bin/frpc ./cmd/frpc
+	env CGO_ENABLED=0 go build -ldflags "$(LDFLAGS)" -o bin/frpc ./cmd/frpc
 
 test: gotest
 
diff --git a/dockerfiles/Dockerfile-for-frpc b/dockerfiles/Dockerfile-for-frpc
index 2251b7b..0c3d02c 100644
--- a/dockerfiles/Dockerfile-for-frpc
+++ b/dockerfiles/Dockerfile-for-frpc
@@ -1,7 +1,9 @@
-FROM alpine:edge
+FROM alpine:3.12.0
 
 RUN apk add --update ca-certificates
 
-ADD bin/frpc  /usr/bin
+ADD bin/frpc /usr/bin
 
-ENTRYPOINT ["frpc"]
\ No newline at end of file
+RUN chmod -R 777 /usr/bin/frpc
+
+ENTRYPOINT ["/usr/bin/frpc"]
diff --git a/dockerfiles/Dockerfile-for-frps b/dockerfiles/Dockerfile-for-frps
index 96d38aa..2ff5f5d 100644
--- a/dockerfiles/Dockerfile-for-frps
+++ b/dockerfiles/Dockerfile-for-frps
@@ -1,7 +1,9 @@
-FROM alpine:edge
+FROM alpine:3.12.0
 
 RUN apk add --update ca-certificates
 
-ADD bin/frps  /usr/bin
+ADD bin/frps /usr/bin
 
-ENTRYPOINT ["frps"]
\ No newline at end of file
+RUN chmod -R 777 /usr/bin/frps
+
+ENTRYPOINT ["/usr/bin/frps"]
-- 
GitLab