Skip to content

Commit ae0b929

Browse files
committed
Updating docker-container-launcher.sh to deliberately run the version of the image that the script was released for
1 parent ddbb3c2 commit ae0b929

File tree

2 files changed

+35
-5
lines changed

2 files changed

+35
-5
lines changed

pom.xml

+34-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<groupId>dev.coldhands</groupId>
@@ -24,6 +25,7 @@
2425
<maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
2526
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
2627
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
28+
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
2729
<appassembler-maven-plugin.version>2.1.0</appassembler-maven-plugin.version>
2830

2931
<junit-jupiter-api.version>5.10.0</junit-jupiter-api.version>
@@ -293,6 +295,33 @@
293295
</executions>
294296
</plugin>
295297

298+
<plugin>
299+
<groupId>org.apache.maven.plugins</groupId>
300+
<artifactId>maven-resources-plugin</artifactId>
301+
<version>${maven-resources-plugin.version}</version>
302+
<executions>
303+
<execution>
304+
<id>copy-resources</id>
305+
<phase>pre-integration-test</phase>
306+
<goals>
307+
<goal>copy-resources</goal>
308+
</goals>
309+
<configuration>
310+
<resources>
311+
<resource>
312+
<directory>src/scripts</directory>
313+
<filtering>true</filtering>
314+
<includes>
315+
<include>docker-container-launcher.sh</include>
316+
</includes>
317+
</resource>
318+
</resources>
319+
<outputDirectory>${project.build.directory}</outputDirectory>
320+
</configuration>
321+
</execution>
322+
</executions>
323+
</plugin>
324+
296325
<plugin>
297326
<groupId>org.apache.maven.plugins</groupId>
298327
<artifactId>maven-antrun-plugin</artifactId>
@@ -302,10 +331,11 @@
302331
<phase>pre-integration-test</phase>
303332
<configuration>
304333
<target>
305-
<copy file="src/scripts/docker-container-launcher.sh" tofile="${project.build.directory}/${scriptName}" />
334+
<move file="${project.build.directory}/docker-container-launcher.sh"
335+
tofile="${project.build.directory}/${scriptName}"/>
306336
<exec executable="chmod">
307-
<arg value="+x" />
308-
<arg file="${project.build.directory}/${scriptName}" />
337+
<arg value="+x"/>
338+
<arg file="${project.build.directory}/${scriptName}"/>
309339
</exec>
310340
</target>
311341
</configuration>

src/scripts/docker-container-launcher.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ docker run \
1212
--name "pair-stairs" \
1313
-v "${DATA_DIR}":/opt/data \
1414
--user "$(id -u):$(id -g)" \
15-
ghcr.io/jamieredding/pair-stairs:latest \
15+
${dockerImageName}:${project.version} \
1616
"$@"

0 commit comments

Comments
 (0)