Skip to content

Commit fcc87c4

Browse files
ofahimIQSSofahimIQSS
authored
Merge pull request #11567 from IQSS/11477-fix-pushing
Backporting skip push tags to old releases
2 parents 14d3185 + f64981b commit fcc87c4

6 files changed

Lines changed: 52 additions & 28 deletions

File tree

‎modules/container-configbaker/backports/v6.4/002-pom.xml.patch‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/pom.xml 2025-06-02 14:31:28.029431640 +0200
22
+++ b/pom.xml 2025-06-02 14:35:53.292611391 +0200
3-
@@ -1069,18 +1069,32 @@
3+
@@ -996,18 +996,32 @@
44
<postgresql.server.version>17</postgresql.server.version>
55

66
<app.image>gdcc/dataverse:${app.image.tag}</app.image>
@@ -36,7 +36,7 @@
3636
<!-- Variables as used in docker-compose.yml -->
3737
<APP_IMAGE>${app.image}</APP_IMAGE>
3838
<POSTGRES_VERSION>${postgresql.server.version}</POSTGRES_VERSION>
39-
@@ -1088,7 +1102,7 @@
39+
@@ -1015,7 +1029,7 @@
4040
<DATAVERSE_DB_USER>dataverse</DATAVERSE_DB_USER>
4141
<SKIP_DEPLOY>${app.skipDeploy}</SKIP_DEPLOY>
4242
</properties>
@@ -45,7 +45,7 @@
4545
<build>
4646
<plugins>
4747
<!-- Build the exploded WAR target directory -->
48-
@@ -1106,7 +1120,7 @@
48+
@@ -1033,7 +1047,7 @@
4949
<configuration>
5050
</configuration>
5151
</plugin>
@@ -54,15 +54,17 @@
5454
<!-- Build image via Docker Maven Plugin -->
5555
<plugin>
5656
<groupId>io.fabric8</groupId>
57-
@@ -1119,6 +1133,7 @@
57+
@@ -1046,6 +1060,9 @@
5858
<alias>dev_dataverse</alias>
5959
<name>${app.image}</name>
6060
<build>
6161
+ <skip>${app.skipBuild}</skip>
62+
+ <skipPush>${app.skipBuild}</skipPush>
63+
+ <skipTag>${app.skipBuild}</skipTag>
6264
<buildx>
6365
<platforms>
6466
<platform>${docker.platforms}</platform>
65-
@@ -1133,21 +1148,22 @@
67+
@@ -1060,21 +1077,24 @@
6668
<descriptor>assembly.xml</descriptor>
6769
</assembly>
6870
</build>
@@ -85,18 +87,20 @@
8587
<name>${conf.image}</name>
8688
<build>
8789
+ <skip>${conf.skipBuild}</skip>
90+
+ <skipPush>${conf.skipBuild}</skipPush>
91+
+ <skipTag>${conf.skipBuild}</skipTag>
8892
<buildx>
8993
<platforms>
9094
<platform>${docker.platforms}</platform>
91-
@@ -1155,6 +1171,7 @@
95+
@@ -1082,6 +1102,7 @@
9296
</buildx>
9397
<dockerFile>${project.basedir}/modules/container-configbaker/Dockerfile</dockerFile>
9498
<args>
9599
+ <BASE_IMAGE>${conf.image.base}</BASE_IMAGE>
96100
<SOLR_VERSION>${SOLR_VERSION}</SOLR_VERSION>
97101
</args>
98102
<filter>@</filter>
99-
@@ -1162,7 +1179,7 @@
103+
@@ -1089,7 +1110,7 @@
100104
<descriptor>${project.basedir}/modules/container-configbaker/assembly.xml</descriptor>
101105
</assembly>
102106
</build>

‎modules/container-configbaker/backports/v6.5/002-pom.xml.patch‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- a/pom.xml 2025-06-02 14:31:28.029431640 +0200
2-
+++ b/pom.xml 2025-06-02 14:35:53.292611391 +0200
3-
@@ -1069,18 +1069,32 @@
1+
--- pom.xml 2025-06-09 15:49:56.870336502 -0400
2+
+++ pom.xml 2025-06-09 15:58:49.774614821 -0400
3+
@@ -1012,18 +1012,32 @@
44
<postgresql.server.version>17</postgresql.server.version>
55

66
<app.image>gdcc/dataverse:${app.image.tag}</app.image>
@@ -36,7 +36,7 @@
3636
<!-- Variables as used in docker-compose.yml -->
3737
<APP_IMAGE>${app.image}</APP_IMAGE>
3838
<POSTGRES_VERSION>${postgresql.server.version}</POSTGRES_VERSION>
39-
@@ -1088,7 +1102,7 @@
39+
@@ -1031,7 +1045,7 @@
4040
<DATAVERSE_DB_USER>dataverse</DATAVERSE_DB_USER>
4141
<SKIP_DEPLOY>${app.skipDeploy}</SKIP_DEPLOY>
4242
</properties>
@@ -45,7 +45,7 @@
4545
<build>
4646
<plugins>
4747
<!-- Build the exploded WAR target directory -->
48-
@@ -1106,7 +1120,7 @@
48+
@@ -1049,7 +1063,7 @@
4949
<configuration>
5050
</configuration>
5151
</plugin>
@@ -54,15 +54,17 @@
5454
<!-- Build image via Docker Maven Plugin -->
5555
<plugin>
5656
<groupId>io.fabric8</groupId>
57-
@@ -1119,6 +1133,7 @@
57+
@@ -1062,6 +1076,9 @@
5858
<alias>dev_dataverse</alias>
5959
<name>${app.image}</name>
6060
<build>
6161
+ <skip>${app.skipBuild}</skip>
62+
+ <skipPush>${app.skipBuild}</skipPush>
63+
+ <skipTag>${app.skipBuild}</skipTag>
6264
<buildx>
6365
<platforms>
6466
<platform>${docker.platforms}</platform>
65-
@@ -1133,21 +1148,22 @@
67+
@@ -1076,21 +1093,24 @@
6668
<descriptor>assembly.xml</descriptor>
6769
</assembly>
6870
</build>
@@ -85,18 +87,20 @@
8587
<name>${conf.image}</name>
8688
<build>
8789
+ <skip>${conf.skipBuild}</skip>
90+
+ <skipPush>${conf.skipBuild}</skipPush>
91+
+ <skipTag>${conf.skipBuild}</skipTag>
8892
<buildx>
8993
<platforms>
9094
<platform>${docker.platforms}</platform>
91-
@@ -1155,6 +1171,7 @@
95+
@@ -1098,6 +1118,7 @@
9296
</buildx>
9397
<dockerFile>${project.basedir}/modules/container-configbaker/Dockerfile</dockerFile>
9498
<args>
9599
+ <BASE_IMAGE>${conf.image.base}</BASE_IMAGE>
96100
<SOLR_VERSION>${SOLR_VERSION}</SOLR_VERSION>
97101
</args>
98102
<filter>@</filter>
99-
@@ -1162,7 +1179,7 @@
103+
@@ -1105,7 +1126,7 @@
100104
<descriptor>${project.basedir}/modules/container-configbaker/assembly.xml</descriptor>
101105
</assembly>
102106
</build>

‎modules/container-configbaker/backports/v6.6/002-pom.xml.patch‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- a/pom.xml 2025-06-02 14:31:28.029431640 +0200
2-
+++ b/pom.xml 2025-06-02 14:35:53.292611391 +0200
1+
--- pom.xml 2025-06-09 15:50:01.850394782 -0400
2+
+++ pom.xml 2025-06-09 16:00:47.619102709 -0400
33
@@ -1069,18 +1069,32 @@
44
<postgresql.server.version>17</postgresql.server.version>
55

@@ -54,15 +54,17 @@
5454
<!-- Build image via Docker Maven Plugin -->
5555
<plugin>
5656
<groupId>io.fabric8</groupId>
57-
@@ -1119,6 +1133,7 @@
57+
@@ -1119,6 +1133,9 @@
5858
<alias>dev_dataverse</alias>
5959
<name>${app.image}</name>
6060
<build>
6161
+ <skip>${app.skipBuild}</skip>
62+
+ <skipPush>${app.skipBuild}</skipPush>
63+
+ <skipTag>${app.skipBuild}</skipTag>
6264
<buildx>
6365
<platforms>
6466
<platform>${docker.platforms}</platform>
65-
@@ -1133,21 +1148,22 @@
67+
@@ -1133,21 +1150,24 @@
6668
<descriptor>assembly.xml</descriptor>
6769
</assembly>
6870
</build>
@@ -85,18 +87,20 @@
8587
<name>${conf.image}</name>
8688
<build>
8789
+ <skip>${conf.skipBuild}</skip>
90+
+ <skipPush>${conf.skipBuild}</skipPush>
91+
+ <skipTag>${conf.skipBuild}</skipTag>
8892
<buildx>
8993
<platforms>
9094
<platform>${docker.platforms}</platform>
91-
@@ -1155,6 +1171,7 @@
95+
@@ -1155,6 +1175,7 @@
9296
</buildx>
9397
<dockerFile>${project.basedir}/modules/container-configbaker/Dockerfile</dockerFile>
9498
<args>
9599
+ <BASE_IMAGE>${conf.image.base}</BASE_IMAGE>
96100
<SOLR_VERSION>${SOLR_VERSION}</SOLR_VERSION>
97101
</args>
98102
<filter>@</filter>
99-
@@ -1162,7 +1179,7 @@
103+
@@ -1162,7 +1183,7 @@
100104
<descriptor>${project.basedir}/modules/container-configbaker/assembly.xml</descriptor>
101105
</assembly>
102106
</build>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,23 @@
2020

2121
<docker.platforms></docker.platforms>
2222

23-
@@ -1046,6 +1050,7 @@
23+
@@ -1046,6 +1050,9 @@
2424
<alias>dev_dataverse</alias>
2525
<name>${app.image}</name>
2626
<build>
2727
+ <skip>${app.skipBuild}</skip>
28+
+ <skipPush>${app.skipBuild}</skipPush>
29+
+ <skipTag>${app.skipBuild}</skipTag>
2830
<buildx>
2931
<platforms>
3032
<platform>${docker.platforms}</platform>
31-
@@ -1075,6 +1080,7 @@
33+
@@ -1075,6 +1082,9 @@
3234
<alias>dev_bootstrap</alias>
3335
<name>${conf.image}</name>
3436
<build>
3537
+ <skip>${conf.skipBuild}</skip>
38+
+ <skipPush>${conf.skipBuild}</skipPush>
39+
+ <skipTag>${conf.skipBuild}</skipTag>
3640
<buildx>
3741
<platforms>
3842
<platform>${docker.platforms}</platform>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,23 @@
2020

2121
<docker.platforms></docker.platforms>
2222

23-
@@ -1046,6 +1050,7 @@
23+
@@ -1046,6 +1050,9 @@
2424
<alias>dev_dataverse</alias>
2525
<name>${app.image}</name>
2626
<build>
2727
+ <skip>${app.skipBuild}</skip>
28+
+ <skipPush>${app.skipBuild}</skipPush>
29+
+ <skipTag>${app.skipBuild}</skipTag>
2830
<buildx>
2931
<platforms>
3032
<platform>${docker.platforms}</platform>
31-
@@ -1075,6 +1080,7 @@
33+
@@ -1075,6 +1082,9 @@
3234
<alias>dev_bootstrap</alias>
3335
<name>${conf.image}</name>
3436
<build>
3537
+ <skip>${conf.skipBuild}</skip>
38+
+ <skipPush>${conf.skipBuild}</skipPush>
39+
+ <skipTag>${conf.skipBuild}</skipTag>
3640
<buildx>
3741
<platforms>
3842
<platform>${docker.platforms}</platform>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,23 @@
2020

2121
<docker.platforms></docker.platforms>
2222

23-
@@ -1046,6 +1050,7 @@
23+
@@ -1046,6 +1050,9 @@
2424
<alias>dev_dataverse</alias>
2525
<name>${app.image}</name>
2626
<build>
2727
+ <skip>${app.skipBuild}</skip>
28+
+ <skipPush>${app.skipBuild}</skipPush>
29+
+ <skipTag>${app.skipBuild}</skipTag>
2830
<buildx>
2931
<platforms>
3032
<platform>${docker.platforms}</platform>
31-
@@ -1075,6 +1080,7 @@
33+
@@ -1075,6 +1082,9 @@
3234
<alias>dev_bootstrap</alias>
3335
<name>${conf.image}</name>
3436
<build>
3537
+ <skip>${conf.skipBuild}</skip>
38+
+ <skipPush>${conf.skipBuild}</skipPush>
39+
+ <skipTag>${conf.skipBuild}</skipTag>
3640
<buildx>
3741
<platforms>
3842
<platform>${docker.platforms}</platform>

0 commit comments

Comments
 (0)