From 6a598b257008b642bdfb3e5090e2580e7dfc903c Mon Sep 17 00:00:00 2001
From: bjdgy <bjdgy@163.com>
Date: Mon, 29 Jan 2024 20:50:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20docker=20=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/release.yml | 4 ++--
 docker/Dockerfile             | 8 ++++----
 docker/init.sh                | 6 ++++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 018a358..0f6ca1f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -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 }}
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a0ada9a..d0fc32d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -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
diff --git a/docker/init.sh b/docker/init.sh
index 2e04448..8ebc6d0 100644
--- a/docker/init.sh
+++ b/docker/init.sh
@@ -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