Skip to content

Commit b2dc0ff

Browse files
authored
Merge pull request #43 from xxcxy/dev-maven
fix Workmanager link
2 parents 74ece1c + 4220021 commit b2dc0ff

File tree

4 files changed

+30
-4
lines changed

4 files changed

+30
-4
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ WORKDIR /opt/autopilot
88

99
Add ./target/auto-pilot-1.0-SNAPSHOT-spring-boot.jar /opt/autopilot/
1010
Add ./xml_phase_template.xsd /opt/autopilot/
11-
Add ./templates /opt/autopilot/templates/
11+
Add ./target/templates /opt/autopilot/templates/
1212

1313
CMD ["java", "-jar", "auto-pilot-1.0-SNAPSHOT-spring-boot.jar", "-poll", "5"]

ECSDockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ WORKDIR /opt/autopilot
88

99
Add ./target/auto-pilot-1.0-SNAPSHOT-spring-boot.jar /opt/autopilot/
1010
Add ./xml_phase_template.xsd /opt/autopilot/
11-
Add ./templates /opt/autopilot/templates/
11+
Add ./target/templates /opt/autopilot/templates/
1212

1313
CMD ["java", "-jar", "auto-pilot-1.0-SNAPSHOT-spring-boot.jar", "-poll", "5"]

pom.xml

+27-1
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,32 @@
136136
</execution>
137137
</executions>
138138
</plugin>
139+
<plugin>
140+
<groupId>org.apache.maven.plugins</groupId>
141+
<artifactId>maven-resources-plugin</artifactId>
142+
<version>3.2.0</version>
143+
<executions>
144+
<execution>
145+
<id>copy-resource-two</id>
146+
<phase>generate-sources</phase>
147+
<goals>
148+
<goal>copy-resources</goal>
149+
</goals>
150+
<configuration>
151+
<outputDirectory>${basedir}/target/templates</outputDirectory>
152+
<filters>
153+
<filter>token.properties</filter>
154+
</filters>
155+
<resources>
156+
<resource>
157+
<directory>templates</directory>
158+
<filtering>true</filtering>
159+
</resource>
160+
</resources>
161+
</configuration>
162+
</execution>
163+
</executions>
164+
</plugin>
139165
<plugin>
140166
<groupId>org.springframework.boot</groupId>
141167
<artifactId>spring-boot-maven-plugin</artifactId>
@@ -174,4 +200,4 @@
174200
</plugins>
175201
</build>
176202

177-
</project>
203+
</project>

token.properties.local

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ [email protected]
1717
emailengine_smtp_password=top_coder
1818
notificationEmailFromAddress=servicetopcodersoftware.com
1919

20-
exttemplatesdir=templates
20+
exttemplatesdir=target/templates
2121
distributionScriptsBase=/root/web/conf/distribution_scripts/unix
2222

2323
SSO_COOKIE_KEY=tcsso

0 commit comments

Comments
 (0)