Skip to content

Commit 09518af

Browse files
committed
style(ct): use app.image.version for configbaker OCI metadata tags
To have proper references also for future versions, we cannot just use project.version. (As seen with the app image Dockerfile, just transferring the method) Needs a workaround for fabric8io/docker-maven-plugin#1865: Included APP_IMAGE_VERSION in pom.xml and Dockerfile to address version handling issues with the plugin. This ensures proper image versioning and compatibility in the build process.
1 parent 942a5df commit 09518af

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

modules/container-configbaker/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,14 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--"]
8787
# By default run a script that will print a help message and terminate
8888
CMD ["help.sh"]
8989

90+
# Workaround for fabric8io/docker-maven-plugin#1865
91+
ARG APP_IMAGE_VERSION
9092
LABEL org.opencontainers.image.created="@git.build.time@" \
9193
org.opencontainers.image.authors="Research Data Management at FZJ <forschungsdaten@fz-juelich.de>" \
9294
org.opencontainers.image.url="https://guides.dataverse.org/en/latest/container/" \
9395
org.opencontainers.image.documentation="https://guides.dataverse.org/en/latest/container/" \
9496
org.opencontainers.image.source="https://github.com/IQSS/dataverse/tree/develop/modules/container-configbaker" \
95-
org.opencontainers.image.version="@project.version@" \
97+
org.opencontainers.image.version="$APP_IMAGE_VERSION" \
9698
org.opencontainers.image.revision="@git.commit.id.abbrev@" \
9799
org.opencontainers.image.vendor="Global Dataverse Community Consortium" \
98100
org.opencontainers.image.licenses="Apache-2.0" \

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,6 +1178,8 @@
11781178
<args>
11791179
<BASE_IMAGE>${conf.image.base}</BASE_IMAGE>
11801180
<SOLR_VERSION>${SOLR_VERSION}</SOLR_VERSION>
1181+
<!-- Workaround for fabric8io/docker-maven-plugin#1865 -->
1182+
<APP_IMAGE_VERSION>${app.image.version}</APP_IMAGE_VERSION>
11811183
</args>
11821184
<filter>@</filter>
11831185
<assembly>

0 commit comments

Comments
 (0)