修改 docker 编译

bjdgyc · Jan 29, 2024 · b7fbbdc · b7fbbdc
1 parent 39b28f2
commit b7fbbdc
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 22 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,20 +17,22 @@ jobs:
         run: uname -a
 
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '16'
-          cache: 'yarn'
-          cache-dependency-path: 'web/yarn.lock'
-      - uses: actions/setup-go@v4
-        with:
-          go-version: '1.20'
-          cache-dependency-path: 'server/go.sum'
-      - name: Build web
-        working-directory: web
-        run: |
-          yarn install
-          yarn run build
+
+          #      - uses: actions/setup-node@v4
+          #        with:
+          #          node-version: '16'
+          #          cache: 'yarn'
+          #          cache-dependency-path: 'web/yarn.lock'
+          #      - uses: actions/setup-go@v4
+          #        with:
+          #          go-version: '1.20'
+          #          cache-dependency-path: 'server/go.sum'
+          #      - name: Build web
+          #        working-directory: web
+          #        run: |
+          #          yarn install
+          #          yarn run build
+
       - name: Set up QEMU
         # https://github.com/docker/setup-qemu-action
         uses: docker/setup-qemu-action@v3
@@ -52,6 +54,9 @@ jobs:
           echo "APP_VER=$appVer" >> $GITHUB_ENV
           echo "commitId=$commitId" >> $GITHUB_ENV
           
+          mkdir server/ui
+          touch server/ui/a.txt
+          
           cd server;go mod tidy
 
       - name: Build and push

diff --git a/build_docker.sh b/build_docker.sh
@@ -7,8 +7,7 @@ echo $ver
 
 # docker build -t bjdgyc/anylink -f docker/Dockerfile .
 
-docker build -t bjdgyc/anylink --progress=plain --build-arg CN="yes" --build-arg appVer=$ver \
-  --build-arg commitId=$(git rev-parse HEAD) --build-arg buildDate=$(date --iso-8601=seconds) \
-  -f docker/Dockerfile .
+docker buildx build -t bjdgyc/anylink --progress=plain --build-arg CN="yes" --build-arg appVer=$ver \
+  --build-arg commitId=$(git rev-parse HEAD) -f docker/Dockerfile .
 
 docker tag bjdgyc/anylink:latest bjdgyc/anylink:$ver
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -20,8 +20,8 @@ COPY docker/init.sh /tmp/init.sh
 COPY server/ /server/
 COPY web/ui  /server/ui
 
-RUN apk add gcc musl-dev bash
-RUN bash /tmp/init.sh
+#RUN apk add gcc musl-dev bash
+RUN sh /tmp/init.sh
 
 
 # anylink

diff --git a/docker/init.sh b/docker/init.sh
@@ -8,20 +8,23 @@ if [[ $CN == "yes" ]]; then
   export GOPROXY=https://goproxy.cn
 fi
 
-#apk add gcc musl-dev
+apk add tzdata gcc musl-dev
 
 uname -a
+env
+date
 
 cd /server
 
 go mod tidy
 
+echo "start build"
 
 #-extldflags '-static'
 
-ldflags="-s -w -X main.appVer=$appVer -X main.commitId=$commitId -X main.buildDate=$(date -Iseconds)"
+ldflags="-s -w -extldflags \"-static\" -X main.appVer=$appVer -X main.commitId=$commitId -X main.buildDate=$(date -Iseconds)"
 
-go build -v -o anylink -trimpath -ldflags "$ldflags"
+go build -o anylink -trimpath -ldflags "$ldflags"
 
 ls -l /server/