Commit e421ad1f authored by maxiucheng's avatar maxiucheng
Browse files

更新docker

parent 7065e258
eureka:
image: "xxpay-server:1.0.0"
volumes:
- /log:/log
hostname: eureka
ports:
- "2000:2000"
net: "host"
config:
image: "xxpay-config:1.0.0"
volumes:
- /log:/app/log
hostname: config
environment:
EUREKA_HOST: eureka
EUREKA_PORT: 2000
ports:
- "2020:2020"
net: "host"
service:
image: "xxpay-service:1.0.0"
volumes:
- /log:/app/log
hostname: service
environment:
EUREKA_HOST: eureka
EUREKA_PORT: 2000
SERVER_PORT: 3000
ports:
- "3000:3000"
net: "host"
web:
image: "xxpay-web:1.0.0"
volumes:
- /log:/app/log
hostname: web
environment:
EUREKA_HOST: eureka
EUREKA_PORT: 2000
SERVER_PORT: 3010
ports:
- "3010:3010"
net: "host"
zuul:
image: "xxpay-gateway:1.0.0"
volumes:
- /log:/app/log
hostname: zuul
environment:
EUREKA_HOST: eureka
EUREKA_PORT: 2000
ports:
- "3020:3020"
net: "host"
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.xxpay</groupId> <groupId>org.xxpay</groupId>
<artifactId>xxpay4spring-cloud</artifactId> <artifactId>xxpay4spring-cloud</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>xxpay4spring-cloud</name> <name>xxpay4spring-cloud</name>
<description>xxpay4spring-cloud</description> <description>xxpay4spring-cloud</description>
<modules> <modules>
<module>xxpay-server</module> <module>xxpay-server</module>
<module>xxpay-config</module> <module>xxpay-config</module>
<module>xxpay-service</module> <module>xxpay-service</module>
<module>xxpay-web</module> <module>xxpay-web</module>
<module>xxpay-gateway</module> <module>xxpay-gateway</module>
</modules> </modules>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.6.RELEASE</version> <version>1.5.6.RELEASE</version>
</parent> </parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
</properties>
<dependencies> <properties>
<dependency> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<groupId>org.xxpay</groupId> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<artifactId>xxpay-common</artifactId> <java.version>1.8</java.version>
<version>1.0.0</version> </properties>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.xxpay</groupId>
<artifactId>spring-cloud-dependencies</artifactId> <artifactId>xxpay-common</artifactId>
<version>Dalston.SR2</version> <version>1.0.0</version>
<type>pom</type> </dependency>
<scope>import</scope> <dependency>
</dependency> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</dependencyManagement>
<build> <dependencyManagement>
<plugins> <dependencies>
<plugin> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-cloud-dependencies</artifactId>
</plugin> <version>Dalston.SR2</version>
</plugins> <type>pom</type>
</build> <scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version>
<configuration>
<skipDockerBuild>true</skipDockerBuild>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project> </project>
...@@ -36,6 +36,23 @@ ...@@ -36,6 +36,23 @@
<finalName>${project.name}</finalName> <finalName>${project.name}</finalName>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<dockerHost>http://192.168.188.165:2375</dockerHost>
<imageName>${project.name}:${project.version}</imageName>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<skipDockerBuild>false</skipDockerBuild>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.artifactId}.jar</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
......
...@@ -32,6 +32,23 @@ ...@@ -32,6 +32,23 @@
<finalName>${project.name}</finalName> <finalName>${project.name}</finalName>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<dockerHost>http://192.168.188.165:2375</dockerHost>
<imageName>${project.name}:${project.version}</imageName>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<skipDockerBuild>false</skipDockerBuild>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.artifactId}.jar</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
......
FROM java:8
VOLUME /tmp
RUN mkdir /app
ADD xxpay-gateway.jar /app/app.jar
ADD runboot.sh /app/
RUN bash -c 'touch /app/app.jar'
WORKDIR /app
RUN chmod a+x runboot.sh
EXPOSE 3020
CMD /app/runboot.sh
\ No newline at end of file
#!/usr/bin/env bash
sleep 150
java -Djava.security.egd=file:/dev/./urandom -jar /app/app.jar
\ No newline at end of file
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.xxpay</groupId> <groupId>org.xxpay</groupId>
<artifactId>xxpay-server</artifactId> <artifactId>xxpay-service</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>xxpay-server</name> <name>xxpay-service</name>
<description>xxpay-server</description> <description>xxpay-service</description>
<parent> <parent>
<groupId>org.xxpay</groupId> <groupId>org.xxpay</groupId>
...@@ -18,12 +18,68 @@ ...@@ -18,12 +18,68 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.xxpay</groupId>
<artifactId>spring-cloud-starter-eureka-server</artifactId> <artifactId>xxpay-dal</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-activemq</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>1.3.0</version>
</dependency>
<!--wx_pay-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
<version>4.3.5</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.7</version>
</dependency>
<!--ali_pay-->
<dependency>
<groupId>com.alipay</groupId>
<artifactId>sdk</artifactId>
<version>1.5</version>
<scope>system</scope>
<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/alipay-sdk-java20170818173712.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<resources>
<resource>
<directory>src/main/webapp/WEB-INF/lib/</directory>
<targetPath>BOOT-INF/lib/</targetPath>
<includes>
<include>**/*.jar</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<targetPath>BOOT-INF/classes/</targetPath>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -32,6 +88,23 @@ ...@@ -32,6 +88,23 @@
<finalName>${project.name}</finalName> <finalName>${project.name}</finalName>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<dockerHost>http://192.168.188.165:2375</dockerHost>
<imageName>${project.name}:${project.version}</imageName>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<skipDockerBuild>false</skipDockerBuild>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.artifactId}.jar</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
......
FROM java:8
VOLUME /tmp
ADD xxpay-server.jar /app.jar
RUN bash -c 'touch /app.jar'
CMD ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
\ No newline at end of file
...@@ -88,6 +88,23 @@ ...@@ -88,6 +88,23 @@
<finalName>${project.name}</finalName> <finalName>${project.name}</finalName>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<dockerHost>http://192.168.188.165:2375</dockerHost>
<imageName>${project.name}:${project.version}</imageName>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<skipDockerBuild>false</skipDockerBuild>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.artifactId}.jar</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
......
FROM java:8
VOLUME /tmp
RUN mkdir /app
ADD xxpay-service.jar /app/app.jar
ADD runboot.sh /app/
RUN bash -c 'touch /app/app.jar'
WORKDIR /app
RUN chmod a+x runboot.sh
EXPOSE 3000
CMD /app/runboot.sh
\ No newline at end of file
#!/usr/bin/env bash
sleep 90
java -Djava.security.egd=file:/dev/./urandom -jar /app/app.jar
\ No newline at end of file
...@@ -45,6 +45,23 @@ ...@@ -45,6 +45,23 @@
<finalName>${project.name}</finalName> <finalName>${project.name}</finalName>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<dockerHost>http://192.168.188.165:2375</dockerHost>
<imageName>${project.name}:${project.version}</imageName>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<skipDockerBuild>false</skipDockerBuild>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.artifactId}.jar</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
......
FROM java:8
VOLUME /tmp
RUN mkdir /app
ADD xxpay-web.jar /app/app.jar
ADD runboot.sh /app/
RUN bash -c 'touch /app/app.jar'
WORKDIR /app
RUN chmod a+x runboot.sh
EXPOSE 3010
CMD /app/runboot.sh
\ No newline at end of file
#!/usr/bin/env bash
sleep 120
java -Djava.security.egd=file:/dev/./urandom -jar /app/app.jar
\ No newline at end of file
Supports Markdown
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