diff --git a/neutrino-proxy-server/Dockerfile b/neutrino-proxy-server/Dockerfile index 6893ea59..56aa5cef 100644 --- a/neutrino-proxy-server/Dockerfile +++ b/neutrino-proxy-server/Dockerfile @@ -1,15 +1,13 @@ -FROM openjdk:8-jdk-alpine +FROM openjdk:17-jdk-alpine #同步时间 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ apk update && apk add wget unzip vim && apk add -U tzdata && \ ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone RUN mkdir -p /root/neutrino-proxy/config -RUN mkdir -p /root/neutrino-proxy/neutrino-proxy-admin WORKDIR /root/neutrino-proxy -COPY ../neutrino-proxy-server/target/neutrino-proxy-server.jar /root/neutrino-proxy/neutrino-proxy-server.jar -COPY ../neutrino-proxy-server/src/main/resources/app.yml /root/neutrino-proxy/config -COPY ../neutrino-proxy-admin/dist /root/neutrino-proxy/neutrino-proxy-admin/dist +COPY ./target/neutrino-proxy-server.jar /root/neutrino-proxy/neutrino-proxy-server.jar +COPY ./src/main/resources/app.yml /root/neutrino-proxy/config #VOLUME ["/root/neutrino-proxy"] ENTRYPOINT ["java","-jar","neutrino-proxy-server.jar","config=./config/app.yml"] -#docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 -v /root/neutrino-proxy/config:/root/neutrino-proxy/config -d --restart=always --name neutrino registry.cn-hangzhou.aliyuncs.com/asgc/aoshiguchen-docker-images:1.7 \ No newline at end of file +#docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 -v /root/neutrino-proxy/config:/root/neutrino-proxy/config -d --restart=always --name neutrino registry.cn-hangzhou.aliyuncs.com/asgc/aoshiguchen-docker-images:1.7 diff --git a/scripts/unix/server_docker_build.sh b/scripts/unix/server_docker_build.sh index 364b0873..199ec426 100644 --- a/scripts/unix/server_docker_build.sh +++ b/scripts/unix/server_docker_build.sh @@ -1,14 +1,14 @@ #!/bin/sh # 镜像版本,每次更新版本时需要调整 -ImageVer=1.0.0 +ImageVer=2.0.0 ImageName=neutrino-proxy -DockerFilePath=$PWD/../.. +DockerFilePath=$PWD/../../neutrino-proxy-server -#echo '打包jar...' -sh ./server_build.sh -#echo '打包管理后台...' -sh ./admin_build_docker.sh +##echo '打包管理后台...' +#sh ./admin_build_docker.sh +##echo '打包jar...' +#sh ./server_build.sh # 删除老的本地镜像 docker rmi -f $(docker images | grep $ImageName | awk '{print $3}')