From 948437cb183c4c0281aded77f0e63d871a8f225d Mon Sep 17 00:00:00 2001 From: Stille Date: Wed, 16 Nov 2022 12:26:53 +0800 Subject: [PATCH] update v0.3.3.18 for x-ui --- .gitmodules | 3 --- x-ui/Dockerfile | 10 +++++----- x-ui/x-ui | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 .gitmodules delete mode 160000 x-ui/x-ui diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 5d52328..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "x-ui/x-ui"] - path = x-ui/x-ui - url = https://github.com/vaxilu/x-ui diff --git a/x-ui/Dockerfile b/x-ui/Dockerfile index 66ad411..d39beb8 100644 --- a/x-ui/Dockerfile +++ b/x-ui/Dockerfile @@ -1,11 +1,11 @@ FROM golang:latest AS builder LABEL maintainer="Stille " -ENV VERSION 0.3.2 +ENV VERSION 0.3.3.18 WORKDIR /root -COPY x-ui . -RUN go build main.go +RUN git clone https://github.com/FranzKafkaYu/x-ui +RUN cd x-ui && go build main.go FROM debian:11-slim RUN apt-get update \ @@ -13,7 +13,7 @@ RUN apt-get update \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ENV TZ=Asia/Shanghai WORKDIR /root -COPY --from=builder /root/main /root/x-ui -COPY x-ui/bin/. /root/bin/. +COPY --from=builder /root/x-ui/main /root/x-ui +COPY --from=builder /root/x-ui/bin/. /root/bin/. VOLUME [ "/etc/x-ui" ] CMD [ "./x-ui" ] diff --git a/x-ui/x-ui b/x-ui/x-ui deleted file mode 160000 index 9c1be8c..0000000 --- a/x-ui/x-ui +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9c1be8c57a53953b47ee7c09a93554e73816f907