Skip to content

Conversation

@poikilotherm
Copy link
Contributor

@poikilotherm poikilotherm commented Jul 21, 2025

What this PR does / why we need it:

Add another build trigger for base images in case there is no "r0" tag on the hub, the base image needs no updates, but we're maintaining a release.

Which issue(s) this PR closes:

Special notes for your reviewer:
None

Suggestions on how to test this:
Copy the added bits into a separate test script at .github/workflows/scripts/containers/test.sh:

#!/usr/bin/bash

BASE_IMAGE_REF="gdcc/base:6.8-noble"
IS_DEV=0

source "$( dirname "$0" )/utils.sh"
REV=$( current_revision "$BASE_IMAGE_REF" )

IS_NEW_RELEASE=0
if ! (( IS_DEV )) && [ "$REV" = "-1" ]; then
  echo "This is a newly released version of Dataverse - forcing build, as no r0 image is present on Docker Hub"
  IS_NEW_RELEASE=1
fi

echo "is_new_release: ${IS_NEW_RELEASE}"

Running the script should print:

This is a newly released version of Dataverse - forcing build, as no r0 image is present on Docker Hub
is_new_release: 1

Changing IS_DEV=1 or changing the BASE_IMAGE_REF to point to e.g. 6.6-noble should print is_new_release=0.

Also, please run the maintenance script locally and in DRY_RUN mode and watch for the tag options to be added correctly. You should also run a DAMP_RUN and see if the build log contains the additional tags (the docker build statement should carry them!)

Does this PR introduce a user interface change? If mockups are available, please link/include them here:
Nope.

Is there a release notes update needed for this change?:
Nope.

Additional documentation:
None.

@poikilotherm poikilotherm requested a review from pdurbin as a code owner July 21, 2025 12:06
@poikilotherm poikilotherm added the Size: 0.5 A percentage of a sprint. 0.35 hours label Jul 21, 2025
@github-actions github-actions bot added the Component: Containers Anything related to cloudy Dataverse, shipped in containers. label Jul 21, 2025
Copy link
Member

@pdurbin pdurbin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it should do the trick! Thanks, @poikilotherm!

@pdurbin
Copy link
Member

pdurbin commented Jul 21, 2025

@cmbz cmbz added the FY26 Sprint 3 (2025-07-30 - 2025-08-13) label Jul 31, 2025
@poikilotherm poikilotherm marked this pull request as draft August 1, 2025 14:54
@pdurbin pdurbin moved this from In Progress 💻 to On Hold ⌛ in IQSS Dataverse Project Aug 5, 2025
@cmbz cmbz added FY26 Sprint 4 FY26 Sprint 4 (2025-08-13 - 2025-08-27) and removed FY26 Sprint 4 FY26 Sprint 4 (2025-08-13 - 2025-08-27) labels Aug 16, 2025
@pdurbin pdurbin moved this from On Hold ⌛ to In Progress 💻 in IQSS Dataverse Project Sep 8, 2025
…1661

Adjusted tag parameter names for both `app` and `configbaker` images to follow a consistent schema (`.tag.1`, `.tag.2`). Updated `pom.xml` to define and include additional tags under new parameters.

See also: fabric8io/docker-maven-plugin#1865
…ce 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...)
Updated Dockerfile to include the BASE_IMAGE argument. The ARG value is not available anymore _after_ the FROM statement, so we need to repeat it for the workaround to work in full.
…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.
@poikilotherm poikilotherm marked this pull request as ready for review September 9, 2025 15:49
@poikilotherm
Copy link
Contributor Author

@pdurbin this should be done. Tested it locally. Please try it yourself as well. Thx!

@poikilotherm poikilotherm moved this from In Progress 💻 to Ready for Review ⏩ in IQSS Dataverse Project Sep 9, 2025
@pdurbin pdurbin self-assigned this Sep 9, 2025
@coveralls
Copy link

Coverage Status

coverage: 23.186% (+0.004%) from 23.182%
when pulling af9d096 on 11659-fix-ct-release
into 74b3bc7 on develop.

Copy link
Member

@pdurbin pdurbin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all looks reasonable to me. Approved. Thanks, @poikilotherm! ❤️

@github-project-automation github-project-automation bot moved this from Ready for Review ⏩ to Ready for QA ⏩ in IQSS Dataverse Project Sep 9, 2025
@pdurbin pdurbin removed their assignment Sep 9, 2025
@github-actions

This comment has been minimized.

1 similar comment
@github-actions

This comment has been minimized.

@poikilotherm
Copy link
Contributor Author

@pdurbin @ofahimIQSS we shall run the maintenance action once merged. Thx!

@ofahimIQSS ofahimIQSS moved this from Ready for QA ⏩ to QA ✅ in IQSS Dataverse Project Sep 9, 2025
@ofahimIQSS ofahimIQSS self-assigned this Sep 9, 2025
@cmbz cmbz added the FY26 Sprint 5 FY26 Sprint 5 (2025-08-27 - 2025-09-10) label Sep 10, 2025
@github-actions

This comment has been minimized.

1 similar comment
@github-actions
Copy link

📦 Pushed preview images as

ghcr.io/gdcc/dataverse:11659-fix-ct-release
ghcr.io/gdcc/configbaker:11659-fix-ct-release

🚢 See on GHCR. Use by referencing with full name as printed above, mind the registry name.

@poikilotherm
Copy link
Contributor Author

poikilotherm commented Sep 12, 2025

As per discussion on Zulip, I am going ahead and push the button on this one. Not including it in 6.8 means adding another backport and no proper images at release time. If things go sideways, blame it on the remote guy.

grafik

Scene from Igor movie

@poikilotherm poikilotherm merged commit 90e770e into develop Sep 12, 2025
25 checks passed
@github-project-automation github-project-automation bot moved this from QA ✅ to Merged 🚀 in IQSS Dataverse Project Sep 12, 2025
@poikilotherm poikilotherm deleted the 11659-fix-ct-release branch September 12, 2025 07:07
@ofahimIQSS ofahimIQSS removed their assignment Sep 12, 2025
@cmbz cmbz added the FY26 Sprint 6 FY26 Sprint 6 (2025-09-10 - 2025-09-24) label Sep 14, 2025
@scolapasta scolapasta moved this from Merged 🚀 to Done 🧹 in IQSS Dataverse Project Sep 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Component: Containers Anything related to cloudy Dataverse, shipped in containers. FY26 Sprint 3 (2025-07-30 - 2025-08-13) FY26 Sprint 5 FY26 Sprint 5 (2025-08-27 - 2025-09-10) FY26 Sprint 6 FY26 Sprint 6 (2025-09-10 - 2025-09-24) Size: 0.5 A percentage of a sprint. 0.35 hours

Projects

Status: Done 🧹

6 participants