diff --git a/Dockerfile b/Dockerfile index b1d0359..d3da7cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ ARG TARGETOS TARGETARCH TARGETVARIANT RUN echo 111111111111 COPY go2 /go/src/go2 COPY goodlink2 /go/src/goodlink2 +COPY proxy2 /go/src/proxy RUN --mount=target=. \ --mount=type=cache,target=/root/.cache/go-build \ diff --git a/build.sh b/build.sh index 0faa49a..ce29c06 100755 --- a/build.sh +++ b/build.sh @@ -4,10 +4,10 @@ go install github.com/akavel/rsrc@latest set -x -rm -rf go2 goodlink2 proxy +rm -rf go2 goodlink2 proxy2 cp -r ../go2 . cp -r ../goodlink2 . -cp -r ../proxy . +cp -r ../proxy proxy2 if [ -e "/usr/bin/upx" ]; then cp /usr/bin/upx . @@ -22,14 +22,10 @@ make clean BUILD_TIME=$(date +'%Y%m%d%H%M') sed -i "/111111111111/s/111111111111/$BUILD_TIME/g" Dockerfile - -docker pull golang:bookworm -docker pull tonistiigi/xx:golang - docker rmi dev/goodlink:latest -f docker buildx build --platform linux/amd64 -t dev/goodlink:latest . -rm -rf go2 goodlink2 proxy upx +rm -rf go2 goodlink2 proxy2 upx sed -i "/$BUILD_TIME/s/$BUILD_TIME/111111111111/g" Dockerfile