Skip to content

Backporting skip push tags to old releases #11567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ofahimIQSS merged 1 commit into from
Jun 9, 2025
+52 −28
Merged

Backporting skip push tags to old releases #11567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions modules/container-configbaker/backports/v6.4/002-pom.xml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/pom.xml 2025-06-02 14:31:28.029431640 +0200
+++ b/pom.xml 2025-06-02 14:35:53.292611391 +0200
@@ -1069,18 +1069,32 @@
@@ -996,18 +996,32 @@
<postgresql.server.version>17</postgresql.server.version>

<app.image>gdcc/dataverse:${app.image.tag}</app.image>
Expand Down Expand Up @@ -36,7 +36,7 @@
<!-- Variables as used in docker-compose.yml -->
<APP_IMAGE>${app.image}</APP_IMAGE>
<POSTGRES_VERSION>${postgresql.server.version}</POSTGRES_VERSION>
@@ -1088,7 +1102,7 @@
@@ -1015,7 +1029,7 @@
<DATAVERSE_DB_USER>dataverse</DATAVERSE_DB_USER>
<SKIP_DEPLOY>${app.skipDeploy}</SKIP_DEPLOY>
</properties>
Expand All @@ -45,7 +45,7 @@
<build>
<plugins>
<!-- Build the exploded WAR target directory -->
@@ -1106,7 +1120,7 @@
@@ -1033,7 +1047,7 @@
<configuration>
</configuration>
</plugin>
Expand All @@ -54,15 +54,17 @@
<!-- Build image via Docker Maven Plugin -->
<plugin>
<groupId>io.fabric8</groupId>
@@ -1119,6 +1133,7 @@
@@ -1046,6 +1060,9 @@
<alias>dev_dataverse</alias>
<name>${app.image}</name>
<build>
+ <skip>${app.skipBuild}</skip>
+ <skipPush>${app.skipBuild}</skipPush>
+ <skipTag>${app.skipBuild}</skipTag>
<buildx>
<platforms>
<platform>${docker.platforms}</platform>
@@ -1133,21 +1148,22 @@
@@ -1060,21 +1077,24 @@
<descriptor>assembly.xml</descriptor>
</assembly>
</build>
Expand All @@ -85,18 +87,20 @@
<name>${conf.image}</name>
<build>
+ <skip>${conf.skipBuild}</skip>
+ <skipPush>${conf.skipBuild}</skipPush>
+ <skipTag>${conf.skipBuild}</skipTag>
<buildx>
<platforms>
<platform>${docker.platforms}</platform>
@@ -1155,6 +1171,7 @@
@@ -1082,6 +1102,7 @@
</buildx>
<dockerFile>${project.basedir}/modules/container-configbaker/Dockerfile</dockerFile>
<args>
+ <BASE_IMAGE>${conf.image.base}</BASE_IMAGE>
<SOLR_VERSION>${SOLR_VERSION}</SOLR_VERSION>
</args>
<filter>@</filter>
@@ -1162,7 +1179,7 @@
@@ -1089,7 +1110,7 @@
<descriptor>${project.basedir}/modules/container-configbaker/assembly.xml</descriptor>
</assembly>
</build>
Expand Down
22 changes: 13 additions & 9 deletions modules/container-configbaker/backports/v6.5/002-pom.xml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/pom.xml 2025-06-02 14:31:28.029431640 +0200
+++ b/pom.xml 2025-06-02 14:35:53.292611391 +0200
@@ -1069,18 +1069,32 @@
--- pom.xml 2025-06-09 15:49:56.870336502 -0400
+++ pom.xml 2025-06-09 15:58:49.774614821 -0400
@@ -1012,18 +1012,32 @@
<postgresql.server.version>17</postgresql.server.version>

<app.image>gdcc/dataverse:${app.image.tag}</app.image>
Expand Down Expand Up @@ -36,7 +36,7 @@
<!-- Variables as used in docker-compose.yml -->
<APP_IMAGE>${app.image}</APP_IMAGE>
<POSTGRES_VERSION>${postgresql.server.version}</POSTGRES_VERSION>
@@ -1088,7 +1102,7 @@
@@ -1031,7 +1045,7 @@
<DATAVERSE_DB_USER>dataverse</DATAVERSE_DB_USER>
<SKIP_DEPLOY>${app.skipDeploy}</SKIP_DEPLOY>
</properties>
Expand All @@ -45,7 +45,7 @@
<build>
<plugins>
<!-- Build the exploded WAR target directory -->
@@ -1106,7 +1120,7 @@
@@ -1049,7 +1063,7 @@
<configuration>
</configuration>
</plugin>
Expand All @@ -54,15 +54,17 @@
<!-- Build image via Docker Maven Plugin -->
<plugin>
<groupId>io.fabric8</groupId>
@@ -1119,6 +1133,7 @@
@@ -1062,6 +1076,9 @@
<alias>dev_dataverse</alias>
<name>${app.image}</name>
<build>
+ <skip>${app.skipBuild}</skip>
+ <skipPush>${app.skipBuild}</skipPush>
+ <skipTag>${app.skipBuild}</skipTag>
<buildx>
<platforms>
<platform>${docker.platforms}</platform>
@@ -1133,21 +1148,22 @@
@@ -1076,21 +1093,24 @@
<descriptor>assembly.xml</descriptor>
</assembly>
</build>
Expand All @@ -85,18 +87,20 @@
<name>${conf.image}</name>
<build>
+ <skip>${conf.skipBuild}</skip>
+ <skipPush>${conf.skipBuild}</skipPush>
+ <skipTag>${conf.skipBuild}</skipTag>
<buildx>
<platforms>
<platform>${docker.platforms}</platform>
@@ -1155,6 +1171,7 @@
@@ -1098,6 +1118,7 @@
</buildx>
<dockerFile>${project.basedir}/modules/container-configbaker/Dockerfile</dockerFile>
<args>
+ <BASE_IMAGE>${conf.image.base}</BASE_IMAGE>
<SOLR_VERSION>${SOLR_VERSION}</SOLR_VERSION>
</args>
<filter>@</filter>
@@ -1162,7 +1179,7 @@
@@ -1105,7 +1126,7 @@
<descriptor>${project.basedir}/modules/container-configbaker/assembly.xml</descriptor>
</assembly>
</build>
Expand Down
16 changes: 10 additions & 6 deletions modules/container-configbaker/backports/v6.6/002-pom.xml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- a/pom.xml 2025-06-02 14:31:28.029431640 +0200
+++ b/pom.xml 2025-06-02 14:35:53.292611391 +0200
--- pom.xml 2025-06-09 15:50:01.850394782 -0400
+++ pom.xml 2025-06-09 16:00:47.619102709 -0400
@@ -1069,18 +1069,32 @@
<postgresql.server.version>17</postgresql.server.version>

Expand Down Expand Up @@ -54,15 +54,17 @@
<!-- Build image via Docker Maven Plugin -->
<plugin>
<groupId>io.fabric8</groupId>
@@ -1119,6 +1133,7 @@
@@ -1119,6 +1133,9 @@
<alias>dev_dataverse</alias>
<name>${app.image}</name>
<build>
+ <skip>${app.skipBuild}</skip>
+ <skipPush>${app.skipBuild}</skipPush>
+ <skipTag>${app.skipBuild}</skipTag>
<buildx>
<platforms>
<platform>${docker.platforms}</platform>
@@ -1133,21 +1148,22 @@
@@ -1133,21 +1150,24 @@
<descriptor>assembly.xml</descriptor>
</assembly>
</build>
Expand All @@ -85,18 +87,20 @@
<name>${conf.image}</name>
<build>
+ <skip>${conf.skipBuild}</skip>
+ <skipPush>${conf.skipBuild}</skipPush>
+ <skipTag>${conf.skipBuild}</skipTag>
<buildx>
<platforms>
<platform>${docker.platforms}</platform>
@@ -1155,6 +1171,7 @@
@@ -1155,6 +1175,7 @@
</buildx>
<dockerFile>${project.basedir}/modules/container-configbaker/Dockerfile</dockerFile>
<args>
+ <BASE_IMAGE>${conf.image.base}</BASE_IMAGE>
<SOLR_VERSION>${SOLR_VERSION}</SOLR_VERSION>
</args>
<filter>@</filter>
@@ -1162,7 +1179,7 @@
@@ -1162,7 +1183,7 @@
<descriptor>${project.basedir}/modules/container-configbaker/assembly.xml</descriptor>
</assembly>
</build>
Expand Down
8 changes: 6 additions & 2 deletions src/backports/v6.4/002-pom.xml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,23 @@

<docker.platforms></docker.platforms>

@@ -1046,6 +1050,7 @@
@@ -1046,6 +1050,9 @@
<alias>dev_dataverse</alias>
<name>${app.image}</name>
<build>
+ <skip>${app.skipBuild}</skip>
+ <skipPush>${app.skipBuild}</skipPush>
+ <skipTag>${app.skipBuild}</skipTag>
<buildx>
<platforms>
<platform>${docker.platforms}</platform>
@@ -1075,6 +1080,7 @@
@@ -1075,6 +1082,9 @@
<alias>dev_bootstrap</alias>
<name>${conf.image}</name>
<build>
+ <skip>${conf.skipBuild}</skip>
+ <skipPush>${conf.skipBuild}</skipPush>
+ <skipTag>${conf.skipBuild}</skipTag>
<buildx>
<platforms>
<platform>${docker.platforms}</platform>
8 changes: 6 additions & 2 deletions src/backports/v6.5/002-pom.xml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,23 @@

<docker.platforms></docker.platforms>

@@ -1046,6 +1050,7 @@
@@ -1046,6 +1050,9 @@
<alias>dev_dataverse</alias>
<name>${app.image}</name>
<build>
+ <skip>${app.skipBuild}</skip>
+ <skipPush>${app.skipBuild}</skipPush>
+ <skipTag>${app.skipBuild}</skipTag>
<buildx>
<platforms>
<platform>${docker.platforms}</platform>
@@ -1075,6 +1080,7 @@
@@ -1075,6 +1082,9 @@
<alias>dev_bootstrap</alias>
<name>${conf.image}</name>
<build>
+ <skip>${conf.skipBuild}</skip>
+ <skipPush>${conf.skipBuild}</skipPush>
+ <skipTag>${conf.skipBuild}</skipTag>
<buildx>
<platforms>
<platform>${docker.platforms}</platform>
8 changes: 6 additions & 2 deletions src/backports/v6.6/002-pom.xml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,23 @@

<docker.platforms></docker.platforms>

@@ -1046,6 +1050,7 @@
@@ -1046,6 +1050,9 @@
<alias>dev_dataverse</alias>
<name>${app.image}</name>
<build>
+ <skip>${app.skipBuild}</skip>
+ <skipPush>${app.skipBuild}</skipPush>
+ <skipTag>${app.skipBuild}</skipTag>
<buildx>
<platforms>
<platform>${docker.platforms}</platform>
@@ -1075,6 +1080,7 @@
@@ -1075,6 +1082,9 @@
<alias>dev_bootstrap</alias>
<name>${conf.image}</name>
<build>
+ <skip>${conf.skipBuild}</skip>
+ <skipPush>${conf.skipBuild}</skipPush>
+ <skipTag>${conf.skipBuild}</skipTag>
<buildx>
<platforms>
<platform>${docker.platforms}</platform>