From 52a468d586a7f15d0fcbdc6d98d63c916e7a4216 Mon Sep 17 00:00:00 2001 From: itspooya Date: Mon, 8 May 2023 05:47:43 +0330 Subject: [PATCH] Fixed Dockerfile --- Dockerfile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 810f9ca9..384226d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,20 +12,15 @@ COPY . . ARG TARGETPARCH RUN if $TARGETPARCH == "arm64"; then apt update && apt install gcc-aarch64-linux-gnu -y; fi # Build the X-ui binary -RUN if $TARGETPARCH == "arm64"; then GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc go build -o xui-release-arm64 -v main.go; fi -RUN if $TARGETPARCH == "amd64"; then GOOS=linux GOARCH=amd64 go build -o xui-release-amd64 -v main.go; fi +RUN if $TARGETPARCH == "arm64"; then GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc go build -o xui-release -v main.go; fi +RUN if $TARGETPARCH == "amd64"; then GOOS=linux GOARCH=amd64 go build -o xui-release -v main.go; fi # Start a new stage using the base image FROM ubuntu:20.04 # Set up the working directory WORKDIR /app # Copy the X-ui binary and required files from the builder stage -RUN arch=$(uname -m); \ - if [ "$arch" = "aarch64" ]; then \ - COPY --from=builder /app/xui-release-arm64 /app/x-ui/xui-release; \ - else \ - COPY --from=builder /app/xui-release-amd64 /app/x-ui/xui-release; \ - fi +COPY --from=builder /app/xui-release /app/x-ui/xui-release COPY x-ui.service /app/x-ui/x-ui.service COPY x-ui.sh /app/x-ui/x-ui.sh @@ -41,7 +36,8 @@ WORKDIR /app/x-ui/bin # Download and set up the required files -RUN if [ "$arch" = "aarch64" ]; then \ +RUN arch=$(uname -m) \ + if [ "$arch" = "aarch64" ]; then \ wget https://github.com/mhsanaei/xray-core/releases/latest/download/Xray-linux-arm64-v8a.zip \ && unzip Xray-linux-arm64-v8a.zip \ && rm -f Xray-linux-arm64-v8a.zip geoip.dat geosite.dat iran.dat \ @@ -51,8 +47,9 @@ RUN if [ "$arch" = "aarch64" ]; then \ && mv xray xray-linux-arm64 \ fi -RUN if [ "$arch" = "amd64" ]; then \ - wget https://github.com/mhsanaei/Xray-core/releases/latest/download/Xray-linux-64.zip \ +RUN arch=$(uname -m) \ + if [ "$arch" = "amd64" ]; then \ + wget https://github.com/mhsanaei/Xray-core/releases/latest/download/Xray-linux-64.zip \ && unzip Xray-linux-64.zip \ && rm -f Xray-linux-64.zip geoip.dat geosite.dat iran.dat \ && wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat \