From 94cddf4a3dcb881ab778ba0e987f15b8aeb1dfb1 Mon Sep 17 00:00:00 2001 From: dzzhyk Date: Fri, 3 May 2024 10:33:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20docker=E9=95=9C=E5=83=8F=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E8=AE=BE=E7=BD=AE=E7=AE=A1=E7=90=86=E7=AB=AFjava?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile | 1 + docker/build_image.sh | 2 +- docker/dst_admin_docker.sh | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 98bc313..16e1996 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -58,5 +58,6 @@ EXPOSE 10888/udp EXPOSE 10998/udp EXPOSE 10999/udp +ENV JAVA_OPTS="-server -Xms256m -Xmx256m" ENTRYPOINT ["./dst_admin_docker.sh"] diff --git a/docker/build_image.sh b/docker/build_image.sh index 0f977b4..f593c62 100755 --- a/docker/build_image.sh +++ b/docker/build_image.sh @@ -15,6 +15,6 @@ fi USERNAME=$1 CLIENT_VERSION=$2 -wget http://clouddn.tugos.cn/release/dst-admin-${CLIENT_VERSION}.jar -O ./dst-admin.jar +#wget http://clouddn.tugos.cn/release/dst-admin-${CLIENT_VERSION}.jar -O ./dst-admin.jar docker build -t ${USERNAME}/dst-admin:v${CLIENT_VERSION} . diff --git a/docker/dst_admin_docker.sh b/docker/dst_admin_docker.sh index de0f6ce..3baa050 100644 --- a/docker/dst_admin_docker.sh +++ b/docker/dst_admin_docker.sh @@ -12,7 +12,7 @@ docker_log "------------------------------------------------------------------" docker_log "-- 欢迎使用 dst-admin docker镜像喵~" docker_log "-- 镜像用法、更新日志及常见问题: https://hub.docker.com/r/dzzhyk/dst-admin" docker_log "-- 镜像作者: dzzhyk@qq.com" -docker_log "-- 更新时间: 2024-03-03 14:14:30" +docker_log "-- 更新时间: 2024-05-03 10:12:18" docker_log "------------------------------------------------------------------" docker_log "-- STEP 1 检查*必要*命令安装情况喵!" docker_log "------------------------------------------------------------------" @@ -82,7 +82,9 @@ docker_log "------------------------------------------------------------------" docker_log "------------------------------------------------------------------" docker_log "-- STEP 4 启动dst-admin管理端喵~" -docker_log "-- meow~meow~ 发现*任何*使用docker版本dst-admin问题，可以通过邮件反馈容器日志: dzzhyk@qq.com" -docker_log "-- 导出日志: $ docker logs dst-admin(容器名) > dst-admin-docker.log" +docker_log "-- 提示1: 发现docker版本dst-admin问题，请邮件反馈容器日志 => dzzhyk@qq.com" +docker_log "-- 提示2: 导出容器日志 => docker logs (容器名) > dst-admin-docker.log" +docker_log "-- 提示3: 设置JAVA_OPTS => -e JAVA_OPTS='' 管理端Java启动参数(比如控制管理端内存占用)" +docker_log "---当前JAVA_OPTS: ${JAVA_OPTS}" docker_log "------------------------------------------------------------------" -java -jar -Xms256m -Xmx256m ./dst-admin.jar +java -jar $JAVA_OPTS ./dst-admin.jar From 1d32bed8ef78164cf1c88e0efcce09ed0db00ed4 Mon Sep 17 00:00:00 2001 From: dzzhyk Date: Fri, 24 May 2024 15:29:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=8D=B8=E8=BD=BD=E8=87=AA=E5=B8=A6?= =?UTF-8?q?jdk11=E4=BD=BF=E7=94=A8jdk8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile | 6 +++--- docker/dst_admin_docker.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 16e1996..0f68591 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -18,8 +18,7 @@ ADD dst_admin_docker.sh dst_admin_docker.sh RUN chmod 755 dst_admin_docker.sh RUN dpkg --add-architecture i386 \ - && apt-get update \ - && apt-get install -y --no-install-recommends --no-install-suggests \ + && apt update && apt install -y --no-install-recommends --no-install-suggests \ libstdc++6:i386 \ libgcc1:i386 \ lib32gcc-s1 \ @@ -50,7 +49,8 @@ RUN dpkg --add-architecture i386 \ # amd64 openjdk-8-jre-headless RUN wget http://snapshot.debian.org/archive/debian-security/20220210T090326Z/pool/updates/main/o/openjdk-8/openjdk-8-jre-headless_8u312-b07-1~deb9u1_amd64.deb RUN dpkg -i openjdk-8-jre-headless_8u312-b07-1~deb9u1_amd64.deb -RUN apt-get clean +RUN apt remove openjdk-11-jre-headless -y +RUN apt autoremove -y RUN rm -rf openjdk-8-jre-headless_8u312-b07-1~deb9u1_amd64.deb EXPOSE 8080/tcp diff --git a/docker/dst_admin_docker.sh b/docker/dst_admin_docker.sh index 3baa050..e1fc051 100644 --- a/docker/dst_admin_docker.sh +++ b/docker/dst_admin_docker.sh @@ -12,7 +12,7 @@ docker_log "------------------------------------------------------------------" docker_log "-- 欢迎使用 dst-admin docker镜像喵~" docker_log "-- 镜像用法、更新日志及常见问题: https://hub.docker.com/r/dzzhyk/dst-admin" docker_log "-- 镜像作者: dzzhyk@qq.com" -docker_log "-- 更新时间: 2024-05-03 10:12:18" +docker_log "-- 更新时间: 2024-05-24 15:28:50" docker_log "------------------------------------------------------------------" docker_log "-- STEP 1 检查*必要*命令安装情况喵!" docker_log "------------------------------------------------------------------" @@ -29,7 +29,7 @@ done docker_log "------------------------------------------------------------------" docker_log "-- STEP 1 完成" docker_log "------------------------------------------------------------------" - +java -version docker_log "------------------------------------------------------------------" docker_log "-- STEP 2 检查steamcmd安装情况并更新喵~" docker_log "------------------------------------------------------------------"