Merge branch 'main' into coding-service/Fix-CodingDocker

Author: yunomix2834

docker/java-service.Dockerfile

@@ -22,6 +22,16 @@ COPY chat-service/pom.xml chat-service/pom.xml
 
 # Tải dependency trước để cache (Không compile)
 RUN mvn -q -DskipTests dependency:go-offline
+RUN apt-get update && \
+    apt-get install -y \
+        apt-transport-https \
+        ca-certificates \
+        curl \
+        gnupg && \
+    curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
+    echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian buster stable" > /etc/apt/sources.list.d/docker.list && \
+    apt-get update && \
+    apt-get install -y docker-ce-cli
 
 ## Copy toàn bộ source
 COPY . .
@@ -43,9 +53,53 @@ COPY --from=build /workspace/${MODULE}/target/*.jar app.jar
 
 # Đặt quyền sở hữu cho coding-service
 FROM eclipse-temurin:21-jre
+# Build-args
 ARG MODULE
-ENV JAVA_OPTS=""
+ARG DOCKER_HOST_GID=999
+
+# Cài đặt Docker CLI trong runtime image
+RUN apt-get update && \
+    apt-get install -y \
+        apt-transport-https \
+        ca-certificates \
+        curl \
+        gnupg \
+        sudo && \
+    curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
+    echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian buster stable" > /etc/apt/sources.list.d/docker.list && \
+    apt-get update && \
+    apt-get install -y docker-ce-cli
+
+# Tạo group và user cho ứng dụng (chỉ cho coding-service)
+RUN if [ "$MODULE" = "coding-service" ]; then \
+      groupadd -r -g ${DOCKER_HOST_GID} docker_host && \
+      groupadd -r -g 1001 appuser && \
+      useradd  -r -u 1001 -g appuser -G docker_host appuser && \
+      echo "appuser ALL=(root) NOPASSWD: /usr/bin/docker" >> /etc/sudoers; \
+    fi
+
+# TẠO THƯ MỤC /WORK VÀ CẤP QUYỀN
+RUN if [ "$MODULE" = "coding-service" ]; then \
+      mkdir -p /work && chown -R 1001:1001 /work; \
+    fi
+
+# Thiết lập thư mục làm việc
 WORKDIR /app
+
+# Copy JAR với quyền sở hữu phù hợp
 COPY --from=build /workspace/${MODULE}/target/*.jar app.jar
+
+# Đặt quyền sở hữu cho coding-service
+RUN if [ "$MODULE" = "coding-service" ]; then \
+      chown appuser:appuser app.jar; \
+    fi
+
+# Đảm bảo quyền đọc
+RUN chmod +r app.jar
+
+# Chuyển sang sử dụng user appuser (chỉ cho coding-service)
+USER ${MODULE:+-}${MODULE:+appuser}
+
+ENV JAVA_OPTS=""
 EXPOSE 7777
 ENTRYPOINT ["sh","-c","java $JAVA_OPTS -jar /app/app.jar"]

…h/configuration/ElasticSearchConfig.java …n/elasticsearch/ElasticSearchConfig.javasearch-service/src/main/java/com/codecampus/search/configuration/ElasticSearchConfig.java renamed to search-service/src/main/java/com/codecampus/search/configuration/elasticsearch/ElasticSearchConfig.java search-service/src/main/java/com/codecampus/search/configuration/ElasticSearchConfig.java renamed to search-service/src/main/java/com/codecampus/search/configuration/elasticsearch/ElasticSearchConfig.java

@@ -1,4 +1,4 @@
-package com.codecampus.search.configuration;
+package com.codecampus.search.configuration.elasticsearch;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.elasticsearch.client.ClientConfiguration;