mirror/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2024-11-24 02:59:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

typo fix

Browse Source
This commit is contained in:
fatedier 2020-09-23 14:54:40 +08:00
parent 317f901c1c
commit 008933f304
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-and-push-image.yml vendored
View File

@ -105,7 +105,7 @@ jobs:
run: | run: |
echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
docker push $TAG_FRPC docker push $TAG_FRPC
docker push $TAG_FRPC docker push $TAG_FRPS
# push to gpr # push to gpr
- -
name: Publish to GPR name: Publish to GPR

5
Makefile
View File

@ -1,5 +1,6 @@
export PATH := $(GOPATH)/bin:$(PATH) export PATH := $(GOPATH)/bin:$(PATH)
export GO111MODULE=on export GO111MODULE=on
LDFLAGS := -s -w
all: fmt build all: fmt build
@ -19,10 +20,10 @@ fmt:
go fmt ./... go fmt ./...
frps: frps:
go build -o bin/frps ./cmd/frps env CGO_ENABLED=0 go build -ldflags "$(LDFLAGS)" -o bin/frps ./cmd/frps
frpc: frpc:
go build -o bin/frpc ./cmd/frpc env CGO_ENABLED=0 go build -ldflags "$(LDFLAGS)" -o bin/frpc ./cmd/frpc
test: gotest test: gotest

8
dockerfiles/Dockerfile-for-frpc
View File

@ -1,7 +1,9 @@
FROM alpine:edge FROM alpine:3.12.0
RUN apk add --update ca-certificates RUN apk add --update ca-certificates
ADD bin/frpc /usr/bin ADD bin/frpc /usr/bin
ENTRYPOINT ["frpc"] RUN chmod -R 777 /usr/bin/frpc
ENTRYPOINT ["/usr/bin/frpc"]

8
dockerfiles/Dockerfile-for-frps
View File

@ -1,7 +1,9 @@
FROM alpine:edge FROM alpine:3.12.0
RUN apk add --update ca-certificates RUN apk add --update ca-certificates
ADD bin/frps /usr/bin ADD bin/frps /usr/bin
ENTRYPOINT ["frps"] RUN chmod -R 777 /usr/bin/frps
ENTRYPOINT ["/usr/bin/frps"]