Browse Source

update v0.3.2 for x-ui

Stille 3 years ago
parent
commit
3be8662e23
3 changed files with 20 additions and 11 deletions
  1. 15 7
      x-ui/Dockerfile
  2. 3 2
      x-ui/README.md
  3. 2 2
      x-ui/docker-compose.yml

+ 15 - 7
x-ui/Dockerfile

@@ -1,11 +1,19 @@
-FROM ubuntu:21.10
+FROM golang:latest AS builder
 LABEL maintainer="Stille <[email protected]>"
 
-ENV VERSION 0.3.1
+ENV VERSION 0.3.2
 
-COPY Shanghai /usr/share/zoneinfo/Asia/
+WORKDIR /root
+COPY x-ui .
+RUN go build main.go
 
-RUN apt -y update && apt -y install curl && \
-    curl -O https://raw.githubusercontent.com/sprov065/x-ui/master/install.sh && chmod +x install.sh&& ./install.sh
-
-CMD [ "sh", "-c", "/usr/local/x-ui/x-ui"]
+FROM debian:11-slim
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends -y ca-certificates \
+    && 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/.
+VOLUME [ "/etc/x-ui" ]
+CMD [ "./x-ui" ]

+ 3 - 2
x-ui/README.md

@@ -5,9 +5,10 @@ Docker [stilleshan/x-ui](https://hub.docker.com/r/stilleshan/x-ui)
 > *docker image support for X86 and ARM*
 
 ## 简介
-基于 [sprov065/x-ui](https://github.com/sprov065/x-ui) 项目的 docker 镜像.
+基于 [vaxilu/x-ui](https://github.com/vaxilu/x-ui) 项目的 docker 镜像.
 
 ## 更新
+- **2022-11-16** 更新`0.3.2`版 docker 镜像,同时支持 X86 和 ARM 架构.
 - **2021-08-01** 更新`0.3.1`版 docker 镜像,同时支持 X86 和 ARM 架构.
 
 ## 注意
@@ -79,5 +80,5 @@ docker-compose up -d
 访问`http://服务器IP:54321`使用账号`admin`密码`admin`登录.注意需开放相关端口防火墙,并及时修改账号密码.
 
 ## 参考
-GitHub [sprov065/x-ui](https://github.com/sprov065/x-ui)
+GitHub [vaxilu/x-ui](https://github.com/vaxilu/x-ui)
 

+ 2 - 2
x-ui/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.7'
 services:
-  x-ui:
-    image: ioiox/x-ui
+  xui:
+    image: stilleshan/x-ui
     container_name: x-ui
     # volumes:
     #   - ./x-ui.db:/etc/x-ui/x-ui.db