From 7d36cad3e0de986f4ef80576073d0b035477bdc6 Mon Sep 17 00:00:00 2001
From: Meow <197331664+Meo597@users.noreply.github.com>
Date: Sun, 8 Jun 2025 12:49:26 +0800
Subject: [PATCH] Docker: Fix geodata directory permissions issue (#4790)

Fixes https://github.com/XTLS/Xray-core/issues/4747#issuecomment-2953519012
---
 .github/docker/Dockerfile     | 1 +
 .github/docker/Dockerfile.usa | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile
index b7a871f0..0b6f2932 100644
--- a/.github/docker/Dockerfile
+++ b/.github/docker/Dockerfile
@@ -45,6 +45,7 @@ RUN mkdir -p /tmp/var/log/xray && touch \
 FROM gcr.io/distroless/static:nonroot
 
 COPY --from=build --chown=0:0 --chmod=755 /src/xray /usr/local/bin/xray
+COPY --from=build --chown=0:0 --chmod=755 /tmp/empty /usr/local/share/xray
 COPY --from=build --chown=0:0 --chmod=644 /tmp/geodat/*.dat /usr/local/share/xray/
 COPY --from=build --chown=0:0 --chmod=755 /tmp/empty /usr/local/etc/xray
 COPY --from=build --chown=0:0 --chmod=644 /tmp/usr/local/etc/xray/*.json /usr/local/etc/xray/
diff --git a/.github/docker/Dockerfile.usa b/.github/docker/Dockerfile.usa
index 5709e246..b307bc4b 100644
--- a/.github/docker/Dockerfile.usa
+++ b/.github/docker/Dockerfile.usa
@@ -54,6 +54,7 @@ RUN mkdir -p /tmp/var/log/xray && touch \
 FROM --platform=linux/amd64 gcr.io/distroless/static:nonroot
 
 COPY --from=build --chown=0:0 --chmod=755 /src/xray /usr/local/bin/xray
+COPY --from=build --chown=0:0 --chmod=755 /tmp/empty /usr/local/share/xray
 COPY --from=build --chown=0:0 --chmod=644 /tmp/geodat/*.dat /usr/local/share/xray/
 COPY --from=build --chown=0:0 --chmod=755 /tmp/empty /usr/local/etc/xray
 COPY --from=build --chown=0:0 --chmod=644 /tmp/usr/local/etc/xray/*.json /usr/local/etc/xray/