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

Jump to bottom

docker: podman-friendly image locations #404

Merged
merged 2 commits into from
Aug 10, 2023
Merged

docker: podman-friendly image locations #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fe15b1
codecov: add threshold values
tiborsimko Aug 8, 2023
ec86cee
docker: podman-friendly image locations
tiborsimko Aug 8, 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: 9 additions & 3 deletions .github/codecov.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@ codecov:
require_ci_to_pass: yes

coverage:
precision: 2
round: down
range: "80...100"
status:
patch:
default:
informational: true
project:
default:
base: auto
target: auto
threshold: 2%

parsers:
gcov:
Expand Down
6 changes: 3 additions & 3 deletions reana_commons/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# This file is part of REANA.
# Copyright (C) 2018, 2019, 2020, 2021, 2022 CERN.
# Copyright (C) 2018, 2019, 2020, 2021, 2022, 2023 CERN.
#
# REANA is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.
Expand Down Expand Up @@ -467,7 +467,7 @@ def default_workspace():
REANA_WORKFLOW_ENGINES = ["yadage", "cwl", "serial", "snakemake"]
"""Available workflow engines."""

REANA_DEFAULT_SNAKEMAKE_ENV_IMAGE = "snakemake/snakemake:v6.8.0"
REANA_DEFAULT_SNAKEMAKE_ENV_IMAGE = "docker.io/snakemake/snakemake:v6.8.0"
"""Snakemake default job environment image."""

REANA_JOB_CONTROLLER_CONNECTION_CHECK_SLEEP = float(
Expand All @@ -481,7 +481,7 @@ def default_workspace():
# Kerberos configurations

KRB5_CONTAINER_IMAGE = os.getenv(
"KRB5_CONTAINER_IMAGE", "reanahub/reana-auth-krb5:1.0.1"
"KRB5_CONTAINER_IMAGE", "docker.io/reanahub/reana-auth-krb5:1.0.1"
)
"""Default docker image of KRB5 sidecar container."""

Expand Down
8 changes: 4 additions & 4 deletions reana_commons/openapi_specifications/reana_job_controller.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
"atlas.cern.ch",
"atlas-condb.cern.ch"
],
"docker_img": "busybox",
"docker_img": "docker.io/library/busybox",
"job_id": "1612a779-f3fa-4344-8819-3d12fa9b9d90",
"max_restart_count": 3,
"restart_count": 0,
Expand All @@ -207,7 +207,7 @@
"atlas.cern.ch",
"atlas-condb.cern.ch"
],
"docker_img": "busybox",
"docker_img": "docker.io/library/busybox",
"job_id": "2e4bbc1d-db5e-4ee0-9701-6e2b1ba55c20",
"max_restart_count": 3,
"restart_count": 0,
Expand Down Expand Up @@ -300,7 +300,7 @@
"atlas.cern.ch",
"atlas-condb.cern.ch"
],
"docker_img": "busybox",
"docker_img": "docker.io/library/busybox",
"job_id": "cdcf48b1-c2f3-4693-8230-b066e088c6ac",
"max_restart_count": 3,
"restart_count": 0,
Expand Down Expand Up @@ -413,4 +413,4 @@
}
},
"swagger": "2.0"
}
}
8 changes: 4 additions & 4 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# This file is part of REANA.
# Copyright (C) 2018, 2019, 2021 CERN.
# Copyright (C) 2018, 2019, 2021, 2023 CERN.
#
# REANA is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.
Expand All @@ -27,7 +27,7 @@ def dummy_snakefile():
output:
"results/foo.txt"
container:
"docker://python:3.10.0-buster"
"docker://docker.io/library/python:3.10.0-buster"
resources:
kubernetes_memory_limit="256Mi"
shell:
Expand All @@ -39,7 +39,7 @@ def dummy_snakefile():
output:
"results/bar.txt"
container:
"docker://python:3.10.0-buster"
"docker://docker.io/library/python:3.10.0-buster"
resources:
kubernetes_memory_limit="256Mi"
shell:
Expand All @@ -52,7 +52,7 @@ def dummy_snakefile():
output:
"results/baz.txt"
container:
"docker://python:3.10.0-buster"
"docker://docker.io/library/python:3.10.0-buster"
resources:
kubernetes_memory_limit="256Mi"
shell:
Expand Down
Loading