mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2025-09-12 13:10:05 +00:00
0fb1fb3b5c
This commit addresses several issues I identified in the backend Docker container:
1. **Xray-core Execution Failure (`open bin/config.json`):**
- I modified `Dockerfile.backend` to correctly set up the Xray-core environment:
- It now creates the `/app/bin` directory.
- It downloads a specified version (v1.8.10) of Xray-core for linux-amd64, along with `geoip.dat` and `geosite.dat`, from the XTLS/Xray-core GitHub releases.
- It renames the Xray binary to `xray-linux-amd64` (matching the expected name pattern from `xray/process.go`) and places it, `geoip.dat`, and `geosite.dat` into `/app/bin/`.
- It makes the `/app/bin/xray-linux-amd64` binary executable.
- This ensures that the `x-ui` application can find the Xray binary and has a writable directory for `config.json`, resolving the "open bin/config.json: no such file or directory" errors.
2. **Fail2ban Configuration Error (`Have not found any log file for sshd jail`):**
- I created a new configuration file `xui_fail2ban.local`.
- This file is copied to `/etc/fail2ban/jail.local` within the Docker image.
- It explicitly disables the `[sshd]` jail, which was causing errors in an environment without an active sshd service or its logs.
- It ensures the `[3x-ipl]` jail (presumably for the panel's IP limiting) remains enabled, relying on the application to manage its specific filter and action rules.
3. **Docker Compose Version Warning:**
- I removed the `version: '3.8'` line from `docker-compose.yml` as it is obsolete and was causing a warning.
These changes aim to create a more stable and correctly configured backend service. You will need to rebuild the Docker images using `docker compose up -d --build --remove-orphans` to apply these fixes.
59 lines
2.4 KiB
Text
59 lines
2.4 KiB
Text
# Stage 1: Build the Go application
|
|
FROM golang:1.24.3-alpine AS builder
|
|
|
|
WORKDIR /app
|
|
|
|
# Copy go.mod and go.sum and download dependencies
|
|
COPY go.mod go.sum ./
|
|
RUN apk add --no-cache gcc musl-dev sqlite-dev
|
|
RUN go mod download
|
|
|
|
# Copy the rest of the application source code
|
|
COPY . .
|
|
|
|
# Build the Go application
|
|
# Assuming the main package is in the root and output is 'x-ui' or 'main'
|
|
# The original entrypoint seems to be related to x-ui.sh or DockerEntrypoint.sh
|
|
# We need to ensure the binary is built correctly.
|
|
# For 3x-ui, the main.go seems to be the entry point.
|
|
RUN CGO_ENABLED=1 GOOS=linux go build -a -installsuffix cgo -o /app/x-ui main.go
|
|
|
|
# Stage 2: Production environment
|
|
FROM alpine:latest
|
|
|
|
WORKDIR /app
|
|
RUN mkdir -p /app/bin
|
|
ARG XRAY_VERSION=v1.8.10
|
|
ARG TARGETARCH=amd64
|
|
RUN wget -O /tmp/Xray-linux-${TARGETARCH}.zip https://github.com/XTLS/Xray-core/releases/download/${XRAY_VERSION}/Xray-linux-${TARGETARCH}.zip && \
|
|
unzip /tmp/Xray-linux-${TARGETARCH}.zip -d /app/bin xray geoip.dat geosite.dat && \
|
|
mv /app/bin/xray /app/bin/xray-linux-${TARGETARCH} && \
|
|
chmod +x /app/bin/xray-linux-${TARGETARCH} && \
|
|
rm /tmp/Xray-linux-${TARGETARCH}.zip
|
|
|
|
# Copy the binary from the builder stage
|
|
COPY --from=builder /app/x-ui /app/x-ui
|
|
COPY --from=builder /app/x-ui.sh /app/x-ui.sh
|
|
COPY --from=builder /app/DockerEntrypoint.sh /app/DockerEntrypoint.sh
|
|
COPY --from=builder /app/config/name /app/config/name
|
|
COPY --from=builder /app/config/version /app/config/version
|
|
|
|
|
|
# Ensure necessary directories exist and have correct permissions if needed by the app
|
|
# The original compose file mounts $PWD/db/:/etc/x-ui/ and $PWD/cert/:/root/cert/
|
|
# So, these paths should be available or created by the entrypoint script.
|
|
RUN apk add --no-cache sqlite fail2ban
|
|
RUN mkdir -p /etc/x-ui && \
|
|
mkdir -p /root/cert && \
|
|
chmod +x /app/x-ui.sh /app/DockerEntrypoint.sh /app/x-ui
|
|
|
|
# Expose default panel port (e.g., 2053, but this will be handled by docker-compose)
|
|
# The original compose uses network_mode: host, so ports are directly from the app.
|
|
# If we move away from network_mode: host, we'll need to EXPOSE the correct port here.
|
|
# Let's assume the Go app listens on a port defined by an ENV or config, e.g., 2053
|
|
EXPOSE 2053
|
|
|
|
COPY xui_fail2ban.local /etc/fail2ban/jail.local
|
|
# Entrypoint
|
|
ENTRYPOINT ["/app/DockerEntrypoint.sh"]
|
|
CMD ["/app/x-ui"] # Default command if DockerEntrypoint.sh doesn't override
|