Skip to content

Feat: docker镜像允许设置管理端java参数 #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dzzhyk wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feat: docker镜像允许设置管理端java参数 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94cddf4
feat: docker镜像允许设置管理端java参数
dzzhyk May 3, 2024
1d32bed
fix: 卸载自带jdk11使用jdk8
dzzhyk May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -50,13 +49,15 @@ 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
EXPOSE 10888/udp
EXPOSE 10998/udp
EXPOSE 10999/udp

ENV JAVA_OPTS="-server -Xms256m -Xmx256m"

ENTRYPOINT ["./dst_admin_docker.sh"]
2 changes: 1 addition & 1 deletion docker/build_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} .
12 changes: 7 additions & 5 deletions docker/dst_admin_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-24 15:28:50"
docker_log "------------------------------------------------------------------"
docker_log "-- STEP 1 检查*必要*命令安装情况喵!"
docker_log "------------------------------------------------------------------"
Expand All @@ -29,7 +29,7 @@ done
docker_log "------------------------------------------------------------------"
docker_log "-- STEP 1 完成"
docker_log "------------------------------------------------------------------"

java -version
docker_log "------------------------------------------------------------------"
docker_log "-- STEP 2 检查steamcmd安装情况并更新喵~"
docker_log "------------------------------------------------------------------"
Expand Down Expand Up @@ -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