Skip to content

Commit af9d096

Browse files
poikilothermpoikilotherm
committed
fix(ct): backport fixes for additional tags on app and config image #11661
Updated `pom.xml` across backports to include new parameters (`.tag.1`, `.tag.2`) for both `app` and `configbaker` images. Configured additional tags for usage in container maintenance builds and external Compose workflows. Backports target the last three releases, v6.6, v6.7, and v6.7.1.
1 parent 19efa63 commit af9d096

File tree

3 files changed

+183
-7
lines changed

3 files changed

+183
-7
lines changed

‎src/backports/v6.6/002-pom.xml.patch‎

Lines changed: 95 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
1-
--- a/pom.xml (revision 906f874f9fd56241c41e6c2c2f6989c4406f5909)
2-
+++ b/pom.xml (date 1746655334773)
3-
@@ -997,14 +997,18 @@
1+
--- a/pom.xml
2+
+++ b/pom.xml
3+
@@ -1069,18 +1069,38 @@
4+
<postgresql.server.version>17</postgresql.server.version>
45

56
<app.image>gdcc/dataverse:${app.image.tag}</app.image>
7+
+ <!--
8+
+ Note: We are still using the unstable tag here, as we need it most for development purposes.
9+
+ It will be overridden by the maintenance CI for released app versions.
10+
+ Note: During maintenance we will use the app.image.version setting from the DV parent POM.
11+
+ -->
612
<app.image.tag>unstable</app.image.tag>
13+
+ <!-- Additional tags. Ignored by default (empty), used by maintenance action. -->
14+
+ <app.image.tag.1></app.image.tag.1>
15+
+ <app.image.tag.2></app.image.tag.2>
716
+ <app.skipBuild>false</app.skipBuild>
817
<app.skipDeploy>false</app.skipDeploy>
18+
+
919
<base.image>gdcc/base:${base.image.tag}</base.image>
1020
<!-- Flavor is a release from a Linux distro, such as Ubuntu -->
1121
<base.image.flavor>noble</base.image.flavor>
@@ -14,13 +24,43 @@
1424
+ <base.image.tag>${base.image.version}-${base.image.flavor}${base.image.tag.suffix}</base.image.tag>
1525
+ <!-- Suffix is defaulting to use the image with a specific Payara and Java version for development purpose -->
1626
+ <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
27+
+
1728
<conf.image>gdcc/configbaker:${conf.image.tag}</conf.image>
29+
+ <!-- By default, we use the same tag as the app image for development purposes. Same rules as for app.image.tag apply! -->
1830
<conf.image.tag>${app.image.tag}</conf.image.tag>
31+
-
32+
+ <!-- Additional tags. Ignored by default (empty), used by maintenance action. -->
33+
+ <conf.image.tag.1></conf.image.tag.1>
34+
+ <conf.image.tag.2></conf.image.tag.2>
35+
+ <conf.image.flavor>alpine</conf.image.flavor>
36+
+ <conf.image.base>alpine:3.18</conf.image.base>
1937
+ <conf.skipBuild>false</conf.skipBuild>
20-
38+
+
2139
<docker.platforms></docker.platforms>
22-
23-
@@ -1046,6 +1050,9 @@
40+
-
41+
+
42+
<!-- Variables as used in docker-compose.yml -->
43+
<APP_IMAGE>${app.image}</APP_IMAGE>
44+
<POSTGRES_VERSION>${postgresql.server.version}</POSTGRES_VERSION>
45+
@@ -1088,7 +1108,7 @@
46+
<DATAVERSE_DB_USER>dataverse</DATAVERSE_DB_USER>
47+
<SKIP_DEPLOY>${app.skipDeploy}</SKIP_DEPLOY>
48+
</properties>
49+
-
50+
+
51+
<build>
52+
<plugins>
53+
<!-- Build the exploded WAR target directory -->
54+
@@ -1106,7 +1126,7 @@
55+
<configuration>
56+
</configuration>
57+
</plugin>
58+
-
59+
+
60+
<!-- Build image via Docker Maven Plugin -->
61+
<plugin>
62+
<groupId>io.fabric8</groupId>
63+
@@ -1119,6 +1139,9 @@
2464
<alias>dev_dataverse</alias>
2565
<name>${app.image}</name>
2666
<build>
@@ -30,7 +70,34 @@
3070
<buildx>
3171
<platforms>
3272
<platform>${docker.platforms}</platform>
33-
@@ -1075,6 +1082,9 @@
73+
@@ -1128,26 +1151,33 @@
74+
<args>
75+
<BASE_IMAGE>${base.image}</BASE_IMAGE>
76+
</args>
77+
+ <tags>
78+
+ <tag>${app.image.tag.1}</tag>
79+
+ <tag>${app.image.tag.2}</tag>
80+
+ </tags>
81+
<filter>@</filter>
82+
<assembly>
83+
<descriptor>assembly.xml</descriptor>
84+
</assembly>
85+
</build>
86+
-
87+
+
88+
<run>
89+
</run>
90+
-
91+
+
92+
<external>
93+
<type>compose</type>
94+
<basedir>${project.basedir}</basedir>
95+
<composeFile>docker-compose-dev.yml</composeFile>
96+
</external>
97+
</image>
98+
-
99+
+
100+
<image>
34101
<alias>dev_bootstrap</alias>
35102
<name>${conf.image}</name>
36103
<build>
@@ -40,3 +107,24 @@
40107
<buildx>
41108
<platforms>
42109
<platform>${docker.platforms}</platform>
110+
@@ -1155,14 +1185,19 @@
111+
</buildx>
112+
<dockerFile>${project.basedir}/modules/container-configbaker/Dockerfile</dockerFile>
113+
<args>
114+
+ <BASE_IMAGE>${conf.image.base}</BASE_IMAGE>
115+
<SOLR_VERSION>${SOLR_VERSION}</SOLR_VERSION>
116+
</args>
117+
+ <tags>
118+
+ <tag>${conf.image.tag.1}</tag>
119+
+ <tag>${conf.image.tag.2}</tag>
120+
+ </tags>
121+
<filter>@</filter>
122+
<assembly>
123+
<descriptor>${project.basedir}/modules/container-configbaker/assembly.xml</descriptor>
124+
</assembly>
125+
</build>
126+
-
127+
+
128+
<!--
129+
We skip the run here as it is already included in the external run config
130+
above for the main image via the docker-compose file. Even if using

‎src/backports/v6.7.1/001-pom.xml.patch‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
--- a/pom.xml
2+
+++ b/pom.xml
3+
@@ -1119,6 +1119,9 @@
4+
Note: During maintenance we will use the app.image.version setting from the DV parent POM.
5+
-->
6+
<app.image.tag>unstable</app.image.tag>
7+
+ <!-- Additional tags. Ignored by default (empty), used by maintenance action. -->
8+
+ <app.image.tag.1></app.image.tag.1>
9+
+ <app.image.tag.2></app.image.tag.2>
10+
<app.skipBuild>false</app.skipBuild>
11+
<app.skipDeploy>false</app.skipDeploy>
12+
13+
@@ -1133,6 +1136,9 @@
14+
<conf.image>gdcc/configbaker:${conf.image.tag}</conf.image>
15+
<!-- By default, we use the same tag as the app image for development purposes. Same rules as for app.image.tag apply! -->
16+
<conf.image.tag>${app.image.tag}</conf.image.tag>
17+
+ <!-- Additional tags. Ignored by default (empty), used by maintenance action. -->
18+
+ <conf.image.tag.1></conf.image.tag.1>
19+
+ <conf.image.tag.2></conf.image.tag.2>
20+
<conf.image.flavor>noble</conf.image.flavor>
21+
<conf.image.base>ubuntu:${conf.image.flavor}</conf.image.base>
22+
<conf.skipBuild>false</conf.skipBuild>
23+
@@ -1191,6 +1197,10 @@
24+
<!-- Workaround for fabric8io/docker-maven-plugin#1865 -->
25+
<APP_IMAGE_VERSION>${app.image.version}</APP_IMAGE_VERSION>
26+
</args>
27+
+ <tags>
28+
+ <tag>${app.image.tag.1}</tag>
29+
+ <tag>${app.image.tag.2}</tag>
30+
+ </tags>
31+
<filter>@</filter>
32+
<assembly>
33+
<descriptor>assembly.xml</descriptor>
34+
@@ -1226,6 +1236,10 @@
35+
<!-- Workaround for fabric8io/docker-maven-plugin#1865 -->
36+
<APP_IMAGE_VERSION>${app.image.version}</APP_IMAGE_VERSION>
37+
</args>
38+
+ <tags>
39+
+ <tag>${conf.image.tag.1}</tag>
40+
+ <tag>${conf.image.tag.2}</tag>
41+
+ </tags>
42+
<filter>@</filter>
43+
<assembly>
44+
<descriptor>${project.basedir}/modules/container-configbaker/assembly.xml</descriptor>

‎src/backports/v6.7/001-pom.xml.patch‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
--- a/pom.xml
2+
+++ b/pom.xml
3+
@@ -1119,6 +1119,9 @@
4+
Note: During maintenance we will use the app.image.version setting from the DV parent POM.
5+
-->
6+
<app.image.tag>unstable</app.image.tag>
7+
+ <!-- Additional tags. Ignored by default (empty), used by maintenance action. -->
8+
+ <app.image.tag.1></app.image.tag.1>
9+
+ <app.image.tag.2></app.image.tag.2>
10+
<app.skipBuild>false</app.skipBuild>
11+
<app.skipDeploy>false</app.skipDeploy>
12+
13+
@@ -1133,6 +1136,9 @@
14+
<conf.image>gdcc/configbaker:${conf.image.tag}</conf.image>
15+
<!-- By default, we use the same tag as the app image for development purposes. Same rules as for app.image.tag apply! -->
16+
<conf.image.tag>${app.image.tag}</conf.image.tag>
17+
+ <!-- Additional tags. Ignored by default (empty), used by maintenance action. -->
18+
+ <conf.image.tag.1></conf.image.tag.1>
19+
+ <conf.image.tag.2></conf.image.tag.2>
20+
<conf.image.flavor>noble</conf.image.flavor>
21+
<conf.image.base>ubuntu:${conf.image.flavor}</conf.image.base>
22+
<conf.skipBuild>false</conf.skipBuild>
23+
@@ -1191,6 +1197,10 @@
24+
<!-- Workaround for fabric8io/docker-maven-plugin#1865 -->
25+
<APP_IMAGE_VERSION>${app.image.version}</APP_IMAGE_VERSION>
26+
</args>
27+
+ <tags>
28+
+ <tag>${app.image.tag.1}</tag>
29+
+ <tag>${app.image.tag.2}</tag>
30+
+ </tags>
31+
<filter>@</filter>
32+
<assembly>
33+
<descriptor>assembly.xml</descriptor>
34+
@@ -1226,6 +1236,10 @@
35+
<!-- Workaround for fabric8io/docker-maven-plugin#1865 -->
36+
<APP_IMAGE_VERSION>${app.image.version}</APP_IMAGE_VERSION>
37+
</args>
38+
+ <tags>
39+
+ <tag>${conf.image.tag.1}</tag>
40+
+ <tag>${conf.image.tag.2}</tag>
41+
+ </tags>
42+
<filter>@</filter>
43+
<assembly>
44+
<descriptor>${project.basedir}/modules/container-configbaker/assembly.xml</descriptor>

0 commit comments

Comments
 (0)