Commit 7524855c by guangyi.tan

注释docker打包、elk配置

parent 61057290
...@@ -52,12 +52,12 @@ ...@@ -52,12 +52,12 @@
</plugin> </plugin>
<!-- docker的maven插件 --> <!-- docker的maven插件 -->
<plugin> <!--<plugin>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId> <artifactId>dockerfile-maven-plugin</artifactId>
<version>${docker.maven.verion}</version> <version>${docker.maven.verion}</version>
<executions> <executions>
<!--执行 mvn package 时 自动构建docker镜像并推送到仓库 --> &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;
<execution> <execution>
<id>default</id> <id>default</id>
<phase>package</phase> <phase>package</phase>
...@@ -70,12 +70,12 @@ ...@@ -70,12 +70,12 @@
<configuration> <configuration>
<repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository> <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
<tag>latest</tag> <tag>latest</tag>
<!-- 构建参数,指定jar包名称 --> &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;
<buildArgs> <buildArgs>
<JAR_FILE>${project.name}.jar</JAR_FILE> <JAR_FILE>${project.name}.jar</JAR_FILE>
</buildArgs> </buildArgs>
</configuration> </configuration>
</plugin> </plugin>-->
</plugins> </plugins>
</build> </build>
......
...@@ -40,23 +40,23 @@ ...@@ -40,23 +40,23 @@
</appender> </appender>
<!-- 输出到logstash的appender, LOGSTASH_HOST为logstash的IP和端口,从环境变量注入--> <!-- 输出到logstash的appender, LOGSTASH_HOST为logstash的IP和端口,从环境变量注入-->
<appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender"> <!--<appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_HOST}</destination> <destination>${LOGSTASH_HOST}</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/> <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
</appender> </appender>-->
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 --> <!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root level="warn"> <root level="warn">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
<appender-ref ref="logstash"/> <!--<appender-ref ref="logstash"/>-->
</root> </root>
<logger name="com.github.tangyi" level="info" additivity="false"> <logger name="com.github.tangyi" level="info" additivity="false">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
<appender-ref ref="logstash"/> <!--<appender-ref ref="logstash"/>-->
</logger> </logger>
</configuration> </configuration>
...@@ -102,12 +102,12 @@ ...@@ -102,12 +102,12 @@
</plugin> </plugin>
<!-- docker的maven插件 --> <!-- docker的maven插件 -->
<plugin> <!--<plugin>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId> <artifactId>dockerfile-maven-plugin</artifactId>
<version>${docker.maven.verion}</version> <version>${docker.maven.verion}</version>
<executions> <executions>
<!--执行 mvn package 时 自动构建docker镜像并推送到仓库 --> &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;
<execution> <execution>
<id>default</id> <id>default</id>
<phase>package</phase> <phase>package</phase>
...@@ -120,12 +120,12 @@ ...@@ -120,12 +120,12 @@
<configuration> <configuration>
<repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository> <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
<tag>latest</tag> <tag>latest</tag>
<!-- 构建参数,指定jar包名称 --> &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;
<buildArgs> <buildArgs>
<JAR_FILE>${project.name}.jar</JAR_FILE> <JAR_FILE>${project.name}.jar</JAR_FILE>
</buildArgs> </buildArgs>
</configuration> </configuration>
</plugin> </plugin>-->
</plugins> </plugins>
</build> </build>
......
...@@ -40,23 +40,23 @@ ...@@ -40,23 +40,23 @@
</appender> </appender>
<!-- 输出到logstash的appender, LOGSTASH_HOST为logstash的IP和端口,从环境变量注入--> <!-- 输出到logstash的appender, LOGSTASH_HOST为logstash的IP和端口,从环境变量注入-->
<appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender"> <!--<appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_HOST}</destination> <destination>${LOGSTASH_HOST}</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/> <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
</appender> </appender>-->
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 --> <!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root level="warn"> <root level="warn">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
<appender-ref ref="logstash"/> <!--<appender-ref ref="logstash"/>-->
</root> </root>
<logger name="com.github.tangyi" level="info" additivity="false"> <logger name="com.github.tangyi" level="info" additivity="false">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
<appender-ref ref="logstash"/> <!--<appender-ref ref="logstash"/>-->
</logger> </logger>
</configuration> </configuration>
...@@ -123,12 +123,12 @@ ...@@ -123,12 +123,12 @@
</plugin> </plugin>
<!-- docker的maven插件 --> <!-- docker的maven插件 -->
<plugin> <!--<plugin>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId> <artifactId>dockerfile-maven-plugin</artifactId>
<version>${docker.maven.verion}</version> <version>${docker.maven.verion}</version>
<executions> <executions>
<!--执行 mvn package 时 自动构建docker镜像并推送到仓库 --> &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;
<execution> <execution>
<id>default</id> <id>default</id>
<phase>package</phase> <phase>package</phase>
...@@ -141,12 +141,12 @@ ...@@ -141,12 +141,12 @@
<configuration> <configuration>
<repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository> <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
<tag>latest</tag> <tag>latest</tag>
<!-- 构建参数,指定jar包名称 --> &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;
<buildArgs> <buildArgs>
<JAR_FILE>${project.name}.jar</JAR_FILE> <JAR_FILE>${project.name}.jar</JAR_FILE>
</buildArgs> </buildArgs>
</configuration> </configuration>
</plugin> </plugin>-->
</plugins> </plugins>
</build> </build>
......
...@@ -40,23 +40,23 @@ ...@@ -40,23 +40,23 @@
</appender> </appender>
<!-- 输出到logstash的appender, LOGSTASH_HOST为logstash的IP和端口,从环境变量注入--> <!-- 输出到logstash的appender, LOGSTASH_HOST为logstash的IP和端口,从环境变量注入-->
<appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender"> <!--<appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_HOST}</destination> <destination>${LOGSTASH_HOST}</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/> <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
</appender> </appender>-->
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 --> <!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root level="warn"> <root level="warn">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
<appender-ref ref="logstash"/> <!--<appender-ref ref="logstash"/>-->
</root> </root>
<logger name="com.github.tangyi" level="info" additivity="false"> <logger name="com.github.tangyi" level="info" additivity="false">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
<appender-ref ref="logstash"/> <!--<appender-ref ref="logstash"/>-->
</logger> </logger>
</configuration> </configuration>
...@@ -106,12 +106,12 @@ ...@@ -106,12 +106,12 @@
</plugin> </plugin>
<!-- docker的maven插件 --> <!-- docker的maven插件 -->
<plugin> <!--<plugin>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId> <artifactId>dockerfile-maven-plugin</artifactId>
<version>${docker.maven.verion}</version> <version>${docker.maven.verion}</version>
<executions> <executions>
<!--执行 mvn package 时 自动构建docker镜像并推送到仓库 --> &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;
<execution> <execution>
<id>default</id> <id>default</id>
<phase>package</phase> <phase>package</phase>
...@@ -124,12 +124,12 @@ ...@@ -124,12 +124,12 @@
<configuration> <configuration>
<repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository> <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
<tag>latest</tag> <tag>latest</tag>
<!-- 构建参数,指定jar包名称 --> &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;
<buildArgs> <buildArgs>
<JAR_FILE>${project.name}.jar</JAR_FILE> <JAR_FILE>${project.name}.jar</JAR_FILE>
</buildArgs> </buildArgs>
</configuration> </configuration>
</plugin> </plugin>-->
</plugins> </plugins>
</build> </build>
......
...@@ -40,23 +40,23 @@ ...@@ -40,23 +40,23 @@
</appender> </appender>
<!-- 输出到logstash的appender, LOGSTASH_HOST为logstash的IP和端口,从环境变量注入--> <!-- 输出到logstash的appender, LOGSTASH_HOST为logstash的IP和端口,从环境变量注入-->
<appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender"> <!--<appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_HOST}</destination> <destination>${LOGSTASH_HOST}</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/> <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
</appender> </appender>-->
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 --> <!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root level="warn"> <root level="warn">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
<appender-ref ref="logstash"/> <!--<appender-ref ref="logstash"/>-->
</root> </root>
<logger name="com.github.tangyi" level="info" additivity="false"> <logger name="com.github.tangyi" level="info" additivity="false">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
<appender-ref ref="logstash"/> <!--<appender-ref ref="logstash"/>-->
</logger> </logger>
</configuration> </configuration>
...@@ -83,12 +83,12 @@ ...@@ -83,12 +83,12 @@
</plugin> </plugin>
<!-- docker的maven插件 --> <!-- docker的maven插件 -->
<plugin> <!--<plugin>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId> <artifactId>dockerfile-maven-plugin</artifactId>
<version>${docker.maven.verion}</version> <version>${docker.maven.verion}</version>
<executions> <executions>
<!--执行 mvn package 时 自动构建docker镜像并推送到仓库 --> &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;
<execution> <execution>
<id>default</id> <id>default</id>
<phase>package</phase> <phase>package</phase>
...@@ -101,12 +101,12 @@ ...@@ -101,12 +101,12 @@
<configuration> <configuration>
<repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository> <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
<tag>latest</tag> <tag>latest</tag>
<!-- 构建参数,指定jar包名称 --> &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;
<buildArgs> <buildArgs>
<JAR_FILE>${project.name}.jar</JAR_FILE> <JAR_FILE>${project.name}.jar</JAR_FILE>
</buildArgs> </buildArgs>
</configuration> </configuration>
</plugin> </plugin>-->
</plugins> </plugins>
</build> </build>
......
...@@ -40,23 +40,23 @@ ...@@ -40,23 +40,23 @@
</appender> </appender>
<!-- 输出到logstash的appender, LOGSTASH_HOST为logstash的IP和端口,从环境变量注入--> <!-- 输出到logstash的appender, LOGSTASH_HOST为logstash的IP和端口,从环境变量注入-->
<appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender"> <!--<appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_HOST}</destination> <destination>${LOGSTASH_HOST}</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/> <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
</appender> </appender>-->
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 --> <!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root level="warn"> <root level="warn">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
<appender-ref ref="logstash"/> <!--<appender-ref ref="logstash"/>-->
</root> </root>
<logger name="com.github.tangyi" level="info" additivity="false"> <logger name="com.github.tangyi" level="info" additivity="false">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
<appender-ref ref="logstash"/> <!--<appender-ref ref="logstash"/>-->
</logger> </logger>
</configuration> </configuration>
...@@ -118,12 +118,12 @@ ...@@ -118,12 +118,12 @@
</plugin> </plugin>
<!-- docker的maven插件 --> <!-- docker的maven插件 -->
<plugin> <!--<plugin>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId> <artifactId>dockerfile-maven-plugin</artifactId>
<version>${docker.maven.verion}</version> <version>${docker.maven.verion}</version>
<executions> <executions>
<!--执行 mvn package 时 自动构建docker镜像并推送到仓库 --> &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;
<execution> <execution>
<id>default</id> <id>default</id>
<phase>package</phase> <phase>package</phase>
...@@ -136,12 +136,12 @@ ...@@ -136,12 +136,12 @@
<configuration> <configuration>
<repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository> <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
<tag>latest</tag> <tag>latest</tag>
<!-- 构建参数,指定jar包名称 --> &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;
<buildArgs> <buildArgs>
<JAR_FILE>${project.name}.jar</JAR_FILE> <JAR_FILE>${project.name}.jar</JAR_FILE>
</buildArgs> </buildArgs>
</configuration> </configuration>
</plugin> </plugin>-->
</plugins> </plugins>
</build> </build>
......
...@@ -40,23 +40,23 @@ ...@@ -40,23 +40,23 @@
</appender> </appender>
<!-- 输出到logstash的appender, LOGSTASH_HOST为logstash的IP和端口,从环境变量注入--> <!-- 输出到logstash的appender, LOGSTASH_HOST为logstash的IP和端口,从环境变量注入-->
<appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender"> <!--<appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_HOST}</destination> <destination>${LOGSTASH_HOST}</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/> <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
</appender> </appender>-->
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 --> <!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root level="warn"> <root level="warn">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
<appender-ref ref="logstash"/> <!--<appender-ref ref="logstash"/>-->
</root> </root>
<logger name="com.github.tangyi" level="info" additivity="false"> <logger name="com.github.tangyi" level="info" additivity="false">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
<appender-ref ref="logstash"/> <!--<appender-ref ref="logstash"/>-->
</logger> </logger>
</configuration> </configuration>
...@@ -69,12 +69,12 @@ ...@@ -69,12 +69,12 @@
</plugin> </plugin>
<!-- docker的maven插件 --> <!-- docker的maven插件 -->
<plugin> <!--<plugin>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId> <artifactId>dockerfile-maven-plugin</artifactId>
<version>${docker.maven.verion}</version> <version>${docker.maven.verion}</version>
<executions> <executions>
<!--执行 mvn package 时 自动构建docker镜像并推送到仓库 --> &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;
<execution> <execution>
<id>default</id> <id>default</id>
<phase>package</phase> <phase>package</phase>
...@@ -87,12 +87,12 @@ ...@@ -87,12 +87,12 @@
<configuration> <configuration>
<repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository> <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
<tag>latest</tag> <tag>latest</tag>
<!-- 构建参数,指定jar包名称 --> &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;
<buildArgs> <buildArgs>
<JAR_FILE>${project.name}.jar</JAR_FILE> <JAR_FILE>${project.name}.jar</JAR_FILE>
</buildArgs> </buildArgs>
</configuration> </configuration>
</plugin> </plugin>-->
</plugins> </plugins>
</build> </build>
......
...@@ -40,23 +40,23 @@ ...@@ -40,23 +40,23 @@
</appender> </appender>
<!-- 输出到logstash的appender, LOGSTASH_HOST为logstash的IP和端口,从环境变量注入--> <!-- 输出到logstash的appender, LOGSTASH_HOST为logstash的IP和端口,从环境变量注入-->
<appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender"> <!--<appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_HOST}</destination> <destination>${LOGSTASH_HOST}</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/> <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
</appender> </appender>-->
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 --> <!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root level="warn"> <root level="warn">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
<appender-ref ref="logstash"/> <!--<appender-ref ref="logstash"/>-->
</root> </root>
<logger name="com.github.tangyi" level="info" additivity="false"> <logger name="com.github.tangyi" level="info" additivity="false">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
<appender-ref ref="logstash"/> <!--<appender-ref ref="logstash"/>-->
</logger> </logger>
</configuration> </configuration>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment