From 17f0c20242c6ee3d35b9ee8f677d747ed012423c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 02 九月 2022 16:30:20 +0800
Subject: [PATCH] remove 移除maven docker插件 过于老旧功能缺陷大 使用idea自带的docker插件替代
---
ruoyi-extend/ruoyi-monitor-admin/pom.xml | 19 ---------
ruoyi-extend/ruoyi-xxl-job-admin/pom.xml | 21 ----------
ruoyi-admin/pom.xml | 19 ---------
.run/ruoyi-admin.run.xml | 12 ++++++
.run/ruoyi-xxl-job-admin.run.xml | 12 ++++++
.run/ruoyi-monitor-admin.run.xml | 12 ++++++
pom.xml | 7 ---
7 files changed, 36 insertions(+), 66 deletions(-)
diff --git a/.run/ruoyi-admin.run.xml b/.run/ruoyi-admin.run.xml
new file mode 100644
index 0000000..77982a0
--- /dev/null
+++ b/.run/ruoyi-admin.run.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="ruoyi-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+ <deployment type="dockerfile">
+ <settings>
+ <option name="imageTag" value="ruoyi/ruoyi-admin:4.3.0-beta2" />
+ <option name="buildOnly" value="true" />
+ <option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
+ </settings>
+ </deployment>
+ <method v="2" />
+ </configuration>
+</component>
diff --git a/.run/ruoyi-monitor-admin.run.xml b/.run/ruoyi-monitor-admin.run.xml
new file mode 100644
index 0000000..a3325b7
--- /dev/null
+++ b/.run/ruoyi-monitor-admin.run.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+ <deployment type="dockerfile">
+ <settings>
+ <option name="imageTag" value="ruoyi/ruoyi-monitor:4.3.0-beta2" />
+ <option name="buildOnly" value="true" />
+ <option name="sourceFilePath" value="ruoyi-extend/ruoyi-monitor-admin/Dockerfile" />
+ </settings>
+ </deployment>
+ <method v="2" />
+ </configuration>
+</component>
diff --git a/.run/ruoyi-xxl-job-admin.run.xml b/.run/ruoyi-xxl-job-admin.run.xml
new file mode 100644
index 0000000..1bdc66a
--- /dev/null
+++ b/.run/ruoyi-xxl-job-admin.run.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="ruoyi-xxl-job-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+ <deployment type="dockerfile">
+ <settings>
+ <option name="imageTag" value="ruoyi/ruoyi-xxl-job-admin:4.3.0-beta2" />
+ <option name="buildOnly" value="true" />
+ <option name="sourceFilePath" value="ruoyi-extend/ruoyi-xxl-job-admin/Dockerfile" />
+ </settings>
+ </deployment>
+ <method v="2" />
+ </configuration>
+</component>
diff --git a/pom.xml b/pom.xml
index 6933b99..23d3d3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,13 +46,6 @@
<!-- SMS 閰嶇疆 -->
<aliyun.sms.version>2.0.16</aliyun.sms.version>
<tencent.sms.version>3.1.555</tencent.sms.version>
-
- <!-- docker 閰嶇疆 -->
- <docker.registry.url>localhost</docker.registry.url>
- <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
- <docker.namespace>ruoyi</docker.namespace>
- <docker.plugin.version>1.2.2</docker.plugin.version>
-
</properties>
<!-- 渚濊禆澹版槑 -->
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 9c3ba15..5ae14c2 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -107,25 +107,6 @@
<warName>${project.artifactId}</warName>
</configuration>
</plugin>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>${docker.plugin.version}</version>
- <configuration>
- <imageName>${docker.namespace}/ruoyi-server:${project.version}</imageName>
- <dockerDirectory>${project.basedir}</dockerDirectory>
- <dockerHost>${docker.registry.host}</dockerHost>
- <registryUrl>${docker.registry.url}</registryUrl>
- <serverId>${docker.registry.url}</serverId>
- <resources>
- <resource>
- <targetPath>/</targetPath>
- <directory>${project.build.directory}</directory>
- <include>${project.build.finalName}.jar</include>
- </resource>
- </resources>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
index 2893a29..d2c116b 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -59,25 +59,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>${docker.plugin.version}</version>
- <configuration>
- <imageName>${docker.namespace}/${project.artifactId}:${project.version}</imageName>
- <dockerDirectory>${project.basedir}</dockerDirectory>
- <dockerHost>${docker.registry.host}</dockerHost>
- <registryUrl>${docker.registry.url}</registryUrl>
- <serverId>${docker.registry.url}</serverId>
- <resources>
- <resource>
- <targetPath>/</targetPath>
- <directory>${project.build.directory}</directory>
- <include>${project.build.finalName}.jar</include>
- </resource>
- </resources>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
index d0a8673..eec7f61 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
@@ -96,27 +96,6 @@
</execution>
</executions>
</plugin>
- <!-- docker -->
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>${docker.plugin.version}</version>
- <configuration>
- <!-- made of '[a-z0-9-_.]' -->
- <imageName>${docker.namespace}/${project.artifactId}:${project.version}</imageName>
- <dockerDirectory>${project.basedir}</dockerDirectory>
- <dockerHost>${docker.registry.host}</dockerHost>
- <registryUrl>${docker.registry.url}</registryUrl>
- <serverId>${docker.registry.url}</serverId>
- <resources>
- <resource>
- <targetPath>/</targetPath>
- <directory>${project.build.directory}</directory>
- <include>${project.build.finalName}.jar</include>
- </resource>
- </resources>
- </configuration>
- </plugin>
</plugins>
</build>
--
Gitblit v1.9.3