From 2ab07a210a33e7d339910bf1e342be1ddf79800f Mon Sep 17 00:00:00 2001
From: Logan <admin@attacker.club>
Date: Mon, 22 Jul 2024 12:15:25 -0400
Subject: [PATCH] init

---
 2.docker/{frpc.dockerfile => dockerfile.frpc}   |  0
 2.docker/{frps.dockerfile => dockerfile.frps}   |  0
 2.docker/dockerfile.jdk-alpine                  |  9 +++++++++
 2.docker/dockerfile.jdk-centos7                 |  0
 ...tomcat.dockerfile => dockerfile.jre8-tomcat} |  0
 ...ckerfile-alpine => dockerfile.python-alpine} |  0
 ...ckerfile-ubuntu => dockerfile.python-ubuntu} |  2 +-
 ...kerfile-centos => dockerfile.python3-centos} |  0
 ...n.dockerfile => dockerfile.python3.8-alpine} |  0
 ...ockerfile-slim => dockerfile.python3.9-slim} |  0
 .../{sshd.dockerfile => dockerfile.sshd-alpine} |  0
 ...ntos7-dockerfile => dockerfile.sshd-centos7} |  0
 2.docker/holmes_ui_npm.dockerfile               | 17 -----------------
 13 files changed, 10 insertions(+), 18 deletions(-)
 rename 2.docker/{frpc.dockerfile => dockerfile.frpc} (100%)
 rename 2.docker/{frps.dockerfile => dockerfile.frps} (100%)
 create mode 100644 2.docker/dockerfile.jdk-alpine
 create mode 100644 2.docker/dockerfile.jdk-centos7
 rename 2.docker/{holmes_api_tomcat.dockerfile => dockerfile.jre8-tomcat} (100%)
 rename 2.docker/{python.Dockerfile-alpine => dockerfile.python-alpine} (100%)
 rename 2.docker/{python.Dockerfile-ubuntu => dockerfile.python-ubuntu} (86%)
 rename 2.docker/{python.Dockerfile-centos => dockerfile.python3-centos} (100%)
 rename 2.docker/{django_python.dockerfile => dockerfile.python3.8-alpine} (100%)
 rename 2.docker/{python.Dockerfile-slim => dockerfile.python3.9-slim} (100%)
 rename 2.docker/{sshd.dockerfile => dockerfile.sshd-alpine} (100%)
 rename 2.docker/{sshd-centos7-dockerfile => dockerfile.sshd-centos7} (100%)
 delete mode 100644 2.docker/holmes_ui_npm.dockerfile

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 <admin@attacker.club>
+
 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