cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: added multiple architecture support

Browse Source
This commit is contained in:
max 2019-07-11 00:37:15 +08:00
parent b33e7deed3
commit a0c81a6e56
7 changed files with 87 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile/frpc/Dockerfile → Dockerfile/frpc/Dockerfile.amd64
View File

@ -1,11 +1,13 @@
FROM golang AS builder FROM golang AS builder
WORKDIR /frp WORKDIR /frp
COPY go.mod .
COPY go.sum .
RUN go mod download
COPY . . COPY . .
RUN make RUN make frpc-amd64
FROM golang FROM golang
WORKDIR / WORKDIR /
COPY --from=builder /frp/bin/frpc /usr/local/bin/frpc COPY --from=builder /frp/bin/amd64/frpc /usr/local/bin/frpc
COPY --from=builder /frp/conf/frpc.ini /etc/frpc.ini COPY --from=builder /frp/conf/frpc.ini /etc/frpc.ini
CMD ["frpc", "--config", "/etc/frpc.ini"] CMD ["frpc", "--config", "/etc/frpc.ini"]

13
Dockerfile/frpc/Dockerfile.arm Normal file
View File

@ -0,0 +1,13 @@
FROM golang AS builder
WORKDIR /frp
COPY go.mod .
COPY go.sum .
RUN go mod download
COPY . .
RUN make frpc-arm
FROM arm32v7/golang:alpine
WORKDIR /
COPY --from=builder /frp/bin/arm/frpc /usr/local/bin/frpc
COPY --from=builder /frp/conf/frpc.ini /etc/frpc.ini
CMD ["frpc", "--config", "/etc/frpc.ini"]

14
Dockerfile/frpc/Dockerfile.arm64 Normal file
View File

@ -0,0 +1,14 @@
FROM golang AS builder
WORKDIR /frp
COPY go.mod .
COPY go.sum .
COPY Makefile .
RUN make fmt
COPY . .
RUN make frpc-arm64
FROM arm64v8/golang:alpine
WORKDIR /
COPY --from=builder /frp/bin/arm64/frpc /usr/local/bin/frpc
COPY --from=builder /frp/conf/frpc.ini /etc/frpc.ini
CMD ["frpc", "--config", "/etc/frpc.ini"]

7
Dockerfile/frps/Dockerfile → Dockerfile/frps/Dockerfile.amd64
View File

@ -1,11 +1,14 @@
FROM golang AS builder FROM golang AS builder
WORKDIR /frp WORKDIR /frp
COPY go.mod .
COPY go.sum .
RUN go mod download
COPY . . COPY . .
RUN make RUN make frps-amd64
FROM golang FROM golang
WORKDIR / WORKDIR /
COPY --from=builder /frp/bin/frps /usr/local/bin/frps COPY --from=builder /frp/bin/amd64/frps /usr/local/bin/frps
COPY --from=builder /frp/conf/frps.ini /etc/frps.ini COPY --from=builder /frp/conf/frps.ini /etc/frps.ini
EXPOSE 7000 7500 EXPOSE 7000 7500
CMD ["frps", "--config", "/etc/frps.ini"] CMD ["frps", "--config", "/etc/frps.ini"]

14
Dockerfile/frps/Dockerfile.arm Normal file
View File

@ -0,0 +1,14 @@
FROM golang AS builder
WORKDIR /frp
COPY go.mod .
COPY go.sum .
RUN go mod download
COPY . .
RUN make frps-arm
FROM arm32v7/golang:alpine
WORKDIR /
COPY --from=builder /frp/bin/arm/frps /usr/local/bin/frps
COPY --from=builder /frp/conf/frps.ini /etc/frps.ini
EXPOSE 7000 7500
CMD ["frps", "--config", "/etc/frps.ini"]

14
Dockerfile/frps/Dockerfile.arm64 Normal file
View File

@ -0,0 +1,14 @@
FROM golang AS builder
WORKDIR /frp
COPY go.mod .
COPY go.sum .
RUN go mod download
COPY . .
RUN make frps-arm64
FROM arm64v8/golang:alpine
WORKDIR /
COPY --from=builder /frp/bin/arm64/frps /usr/local/bin/frps
COPY --from=builder /frp/conf/frps.ini /etc/frps.ini
EXPOSE 7000 7500
CMD ["frps", "--config", "/etc/frps.ini"]

24
Makefile
View File

@ -17,11 +17,27 @@ file:
fmt: fmt:
go fmt ./... go fmt ./...
frps: frps: frps-arm frps-arm64 frps-amd64
go build -o bin/frps ./cmd/frps
frpc: frps-arm:
go build -o bin/frpc ./cmd/frpc GOARCH=arm go build -o bin/arm/frps ./cmd/frps
frps-arm64:
GOARCH=arm64 go build -o bin/arm64/frps ./cmd/frps
frps-amd64:
GOARCH=amd64 go build -o bin/amd64/frps ./cmd/frps
frpc: frpc-arm frpc-arm64 frpc-amd64
frpc-arm:
GOOS=linux GOARCH=arm go build -o bin/arm/frpc ./cmd/frpc
frpc-arm64:
GOOS=linux GOARCH=arm64 go build -o bin/arm64/frpc ./cmd/frpc
frpc-amd64:
GOOS=linux GOARCH=amd64 go build -o bin/amd64/frpc ./cmd/frpc
test: gotest test: gotest