diff --git a/2.docker/frpc.dockerfile b/2.docker/dockerfile.frpc similarity index 100% rename from 2.docker/frpc.dockerfile rename to 2.docker/dockerfile.frpc diff --git a/2.docker/frps.dockerfile b/2.docker/dockerfile.frps similarity index 100% rename from 2.docker/frps.dockerfile rename to 2.docker/dockerfile.frps diff --git a/2.docker/dockerfile.jdk-alpine b/2.docker/dockerfile.jdk-alpine new file mode 100644 index 0000000..a6c3066 --- /dev/null +++ b/2.docker/dockerfile.jdk-alpine @@ -0,0 +1,9 @@ +FROM openjdk:8-jdk-alpine +# FROM openjdk:11-jre-slim +WORKDIR /data +COPY . /data +RUN chmod +x /data/bin/*.sh + +EXPOSE 6206 +ENV JAVA_OPTS="" +CMD ["./bin/server.sh", "start"] \ No newline at end of file diff --git a/2.docker/dockerfile.jdk-centos7 b/2.docker/dockerfile.jdk-centos7 new file mode 100644 index 0000000..e69de29 diff --git a/2.docker/holmes_api_tomcat.dockerfile b/2.docker/dockerfile.jre8-tomcat similarity index 100% rename from 2.docker/holmes_api_tomcat.dockerfile rename to 2.docker/dockerfile.jre8-tomcat diff --git a/2.docker/python.Dockerfile-alpine b/2.docker/dockerfile.python-alpine similarity index 100% rename from 2.docker/python.Dockerfile-alpine rename to 2.docker/dockerfile.python-alpine diff --git a/2.docker/python.Dockerfile-ubuntu b/2.docker/dockerfile.python-ubuntu similarity index 86% rename from 2.docker/python.Dockerfile-ubuntu rename to 2.docker/dockerfile.python-ubuntu index 5afb4a8..4ef5c3f 100644 --- a/2.docker/python.Dockerfile-ubuntu +++ b/2.docker/dockerfile.python-ubuntu @@ -1,6 +1,6 @@ FROM ubuntu:22.04 - MAINTAINER Logan + WORKDIR /opt ## 依赖包 diff --git a/2.docker/python.Dockerfile-centos b/2.docker/dockerfile.python3-centos similarity index 100% rename from 2.docker/python.Dockerfile-centos rename to 2.docker/dockerfile.python3-centos diff --git a/2.docker/django_python.dockerfile b/2.docker/dockerfile.python3.8-alpine similarity index 100% rename from 2.docker/django_python.dockerfile rename to 2.docker/dockerfile.python3.8-alpine diff --git a/2.docker/python.Dockerfile-slim b/2.docker/dockerfile.python3.9-slim similarity index 100% rename from 2.docker/python.Dockerfile-slim rename to 2.docker/dockerfile.python3.9-slim diff --git a/2.docker/sshd.dockerfile b/2.docker/dockerfile.sshd-alpine similarity index 100% rename from 2.docker/sshd.dockerfile rename to 2.docker/dockerfile.sshd-alpine diff --git a/2.docker/sshd-centos7-dockerfile b/2.docker/dockerfile.sshd-centos7 similarity index 100% rename from 2.docker/sshd-centos7-dockerfile rename to 2.docker/dockerfile.sshd-centos7 diff --git a/2.docker/holmes_ui_npm.dockerfile b/2.docker/holmes_ui_npm.dockerfile deleted file mode 100644 index b115cb9..0000000 --- a/2.docker/holmes_ui_npm.dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM nginx:1.11.10-alpine -MAINTAINER Logan "admin@attacker.club" -# 前端静态 - -ENV TZ=Asia/Shanghai -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -RUN mkdir -p /home/jollychic/www - -COPY dist /home/jollychic/www/dist -# npm编译后的静态文件 放nginx镜像里面 - -COPY config/nginx.conf /etc/nginx/conf.d/default.conf -COPY init.sh /home/jollychic/init.sh - -WORKDIR /home/jollychic -EXPOSE 80 -CMD chmod +x init.sh && ./init.sh \ No newline at end of file