mirror of https://github.com/bjdgyc/anylink.git
修改 docker 编译
This commit is contained in:
parent
1f47e3e254
commit
6a598b2570
|
@ -63,8 +63,8 @@ jobs:
|
|||
context: .
|
||||
file: ./docker/Dockerfile
|
||||
#platforms: linux/amd64,linux/arm64
|
||||
platforms: linux/arm64
|
||||
build-args: appVer=$APP_VER commitId=$commitId buildDate=$buildDate
|
||||
platforms: linux/amd64
|
||||
build-args: appVer=${{ env.APP_VER }} commitId=${{ env.commitId }} buildDate=${{ env.buildDate }}
|
||||
#tags: bjdgyc/anylink:latest,bjdgyc/anylink:${{ env.APP_VER }}
|
||||
tags: bjdgyc/anylink:${{ env.APP_VER }}
|
||||
|
||||
|
|
|
@ -16,10 +16,10 @@ ARG buildDate="2020-1-1T11:11:11"
|
|||
|
||||
ENV TZ=Asia/Shanghai
|
||||
|
||||
WORKDIR /anylink
|
||||
WORKDIR /server
|
||||
COPY docker/init.sh /tmp/init.sh
|
||||
COPY server /anylink
|
||||
COPY web/ui /anylink/ui
|
||||
COPY server/ /server/
|
||||
COPY web/ui /server/ui
|
||||
|
||||
RUN sh /tmp/init.sh
|
||||
|
||||
|
@ -32,7 +32,7 @@ ENV TZ=Asia/Shanghai
|
|||
ENV ANYLINK_IN_CONTAINER=true
|
||||
|
||||
WORKDIR /app
|
||||
COPY --from=builder_golang /anylink/anylink /app/
|
||||
COPY --from=builder_golang /server/anylink /app/
|
||||
COPY docker/docker_entrypoint.sh /app/
|
||||
COPY ./server/bridge-init.sh /app/
|
||||
COPY ./server/conf /app/conf
|
||||
|
|
|
@ -12,10 +12,12 @@ fi
|
|||
|
||||
uname -a
|
||||
|
||||
cd /anylink
|
||||
cd /server
|
||||
|
||||
go mod tidy
|
||||
go build -o anylink -trimpath \
|
||||
-ldflags "-s -w -extldflags '-static' -X main.appVer=$appVer -X main.commitId=$commitId -X main.buildDate=$buildDate"
|
||||
|
||||
/anylink/anylink -v
|
||||
ls -l /server/
|
||||
|
||||
/server/anylink -v
|
||||
|
|
Loading…
Reference in New Issue