From 5bf6044cf0f48d1e8e7c71b7bd2343eccc0cdc5e Mon Sep 17 00:00:00 2001
From: Max <shadow.iqka@qq.com>
Date: Fri, 29 Nov 2024 14:38:41 +0800
Subject: [PATCH] Update Dockerfiles to use Ubuntu 24.04 and change download
 source for Yao binary

---
 docker/development/Dockerfile |  4 ++--
 docker/production/Dockerfile  | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index 37498434..387e36fd 100644
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -14,13 +14,13 @@
 #  docker run -d -p 5099:5099 yaoapp/yao:0.9.1-amd64-dev
 #
 # ===========================================
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 ARG VERSION
 ARG ARCH
 RUN groupadd -r yao && useradd -r -g yao yao && \
     apt-get update && \
     apt-get install -y curl sudo procps net-tools
-RUN curl -fsSL "https://release-sv-1252011659.cos.na-siliconvalley.myqcloud.com/archives/yao-${VERSION}-linux-${ARCH}" > /usr/local/bin/yao && \
+RUN curl -fsSL "https://yao.moapi.ai/archives/yao-${VERSION}-linux-${ARCH}" > /usr/local/bin/yao && \
     chmod +x /usr/local/bin/yao && \
     mkdir -p /data/app
 
diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile
index 5339f235..69325beb 100644
--- a/docker/production/Dockerfile
+++ b/docker/production/Dockerfile
@@ -18,9 +18,13 @@ FROM alpine:latest
 ARG VERSION
 ARG ARCH
 RUN apk --no-cache add curl 
-RUN curl -fsSL "https://release-sv-1252011659.cos.na-siliconvalley.myqcloud.com/archives/yao-${VERSION}-linux-${ARCH}" > /usr/local/bin/yao && \
-    chmod +x /usr/local/bin/yao
-RUN mkdir -p /data/app
+RUN curl -fsSL "https://yao.moapi.ai/archives/yao-${VERSION}-linux-${ARCH}" > /usr/local/bin/yao && \
+    chmod +x /usr/local/bin/yao && \
+    addgroup -S yao && adduser -S -G yao yao && \
+    mkdir -p /data/app && \
+    chown -R yao:yao /data/app
+
+USER yao
 VOLUME /data/app
 WORKDIR /data/app
 EXPOSE 5099