I have pushed my changes to foundation-2023

Created

I have created . With this change, my aim is to reduce the duplicate entries (where possible).

I’ll deliver my change to develop branch initially and back port it as required.

I definitely agree with trying to keep things DRY, however opennms-container/*/Makefile aren’t just used in CI, they’re also used by developers, so we’ll need to have reasonable defaults for developer use in the Makefiles. A lot of deduplication has already happened with the introduction of opennms-container/common.mk and it looks like there’s been some work since this ticket was opened in 2021 to get down to using common variable names (e.g. MINION_IMAGE_VERSION seems to no longer be around).

I’m not sure how much is left to do….

It feels like there is some opportunity to deduplicate the image tag and/or OCI file name. It looks like we have “DOCKER_CLI_EXPERIMENTAL: enabled” set in a number of places.

I think we could stand to deduplicate the “deploy-base” image and move it into common.mk and remove it from the Dockerfiles (it’s also referenced in a smoke test, I just noticed).

Random thing I noticed: this is defined but never used?

Related to this ticket, but out of scope for variable: It looks like we do ‘docker login’, ‘docker tag’, and ‘docker push’ in a number of places. Maybe some of these could be centralized (not sure if bash is the right place or makefiles).

This work feels on the critical path for hosting Meridian container images on a non-DockerHub registry.