Skip to content

Commit 485e088

Browse files
committed
refactor(ci): remove unused image property configuration in maintenance scripts
We cannot use the Maven property external configuration bits (which is enabled implicitly by default), as we are using `<external>` with a Compose file. So using this option has no effect on the build! (Same as we cannot add tags this way...)
1 parent aa94508 commit 485e088

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.github/workflows/scripts/containers/maintain-application.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,7 @@ for BRANCH in "$@"; do
148148
# Build the application image, but skip the configbaker image (that's a different job)!
149149
# shellcheck disable=SC2046
150150
mvn -Pct -f . deploy -Ddocker.noCache -Ddocker.platforms="${PLATFORMS}" \
151-
-Dconf.skipBuild -Dbase.image="${BASE_IMAGE_REF}" \
152-
-Ddocker.imagePropertyConfiguration=override $TAG_OPTIONS \
151+
-Dconf.skipBuild -Dbase.image="${BASE_IMAGE_REF}" $TAG_OPTIONS \
153152
$( if (( DAMP_RUN )); then echo "-Ddocker.skip.push"; fi )
154153
else
155154
echo "Skipping Maven build as requested by DRY_RUN=1"

.github/workflows/scripts/containers/maintain-configbaker.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ for BRANCH in "$@"; do
145145
# shellcheck disable=SC2046
146146
mvn -Pct -f . deploy -Ddocker.noCache -Ddocker.platforms="${PLATFORMS}" \
147147
-Dapp.skipBuild -Dconf.image.base="${BASE_IMAGE_REF}" \
148-
-Dmaven.main.skip -Dmaven.test.skip -Dmaven.war.skip \
149-
-Ddocker.imagePropertyConfiguration=override $TAG_OPTIONS \
148+
-Dmaven.main.skip -Dmaven.test.skip -Dmaven.war.skip $TAG_OPTIONS \
150149
$( if (( DAMP_RUN )); then echo "-Ddocker.skip.push"; fi )
151150
else
152151
echo "Skipping Maven build as requested by DRY_RUN=1"

0 commit comments

Comments
 (0)