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.

Sign up for GitHub

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

fix: specify involucro path when uploading #941

Merged
merged 4 commits into from
Nov 26, 2023
Merged

fix: specify involucro path when uploading #941

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc501ed
[fix] specify involucro path when uploading
daler Nov 26, 2023
65ec30a
set proper env var for mulled-build
daler Nov 26, 2023
24b3698
DEST_BASE_IMAGE should already be in env
daler Nov 26, 2023
0173a1d
Merge branch 'master' into involucro-patch
bgruening Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion bioconda_utils/upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,22 @@ def mulled_upload(image: str, quay_target: str) -> sp.CompletedProcess:
quary_target: name of image on quay
"""
cmd = ['mulled-build', 'push', image, '-n', quay_target]

# galaxy-lib always downloads involucro, unless it's in cwd or its path is
# explicitly given.
involucro_path = os.path.join(os.path.dirname(__file__), 'involucro')
if not os.path.exists(involucro_path):
raise RuntimeError('internal involucro wrapper missing')
cmd += ['--involucro-path', involucro_path]

env = os.environ.copy()

mask = []
if os.environ.get('QUAY_OAUTH_TOKEN', False):
token = os.environ['QUAY_OAUTH_TOKEN']
cmd.extend(['--oauth-token', token])
mask = [token]
return utils.run(cmd, mask=mask)
return utils.run(cmd, mask=mask, env=env)


def skopeo_upload(image_file: str, target: str,
Expand Down