Skip to content
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.

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

Make rucio-client image compatible with rucio/rucio-clients:release-33+ base images #269

Merged
merged 2 commits into from
Aug 13, 2024

Conversation

AndresTanasijczuk
Copy link
Contributor

This change allows to upgrade to a more recent rucio/rucio-clients base image (>= release-33.0.0), which use the new tool /usr/local/rucio_client/merge_rucio_configs.py to create the rucio config. See rucio/containers@89539d6.

Note that rucio configuration variables passed via environment variables now need to have the configuration section name after the RUCIO_CFG_ prefix. Thus, if the base image is updated to a version >= release-33.0.0, the VRE documentation (e.g. https://vre-hub.github.io/docs/rucio.html) must also be updated. For example, the command

docker run --user root -e RUCIO_CFG_CLIENT_X509_PROXY=/tmp/x509up -e RUCIO_CFG_AUTH_TYPE=x509_proxy -e RUCIO_CFG_ACCOUNT=<myrucioname> -v ....  -it --name=rucio-client ghcr.io/vre-hub/vre-rucio-client

should become

docker run --user root -e RUCIO_CFG_CLIENT_CLIENT_X509_PROXY=/tmp/x509up -e RUCIO_CFG_CLIENT_AUTH_TYPE=x509_proxy -e RUCIO_CFG_CLIENT_ACCOUNT=<myrucioname> -v .... -it --name=rucio-client ghcr.io/vre-hub/vre-rucio-client

@garciagenrique
Copy link
Member

Hi @AndresTanasijczuk,

Thanks for this PR !

I will however put it on hold: until we don't move to v32+ on our cluster we won't be building images that are compatible with higher versions.
Also, I think that it will be a better approach to add the rucio.default.cfg.escape file to the rucio/containers repository (upstream) rather than here.

@AndresTanasijczuk
Copy link
Contributor Author

AndresTanasijczuk commented Jan 16, 2024

Also, I think that it will be a better approach to add the rucio.default.cfg.escape file to the rucio/containers repository (upstream) rather than here.

They have their rucio.default.cfg in rucio/containers/clients/rucio.default.cfg (https://github.com/rucio/containers/blob/master/clients/rucio.default.cfg). The Dockerfile has to copy the rucio default config to the /opt/user/rucio.default.cfg location, because this is the location used by the merge_rucio_configs.py tool in the rucio/rucio-clients image (see https://github.com/rucio/containers/blob/master/clients/init_rucio.sh), so I think it is up to the VRE Dockerfile to overwrite /opt/user/rucio.default.cfg with the ESCAPE rucio default config.

Copy link
Member

@garciagenrique garciagenrique left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution @AndresTanasijczuk. I will add the PR and later make some small changes after testing, if needed

@garciagenrique garciagenrique merged commit 154efac into vre-hub:main Aug 13, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants