Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/release_24.1' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
dannon committed Jun 28, 2024
2 parents 4355637 + 6ec7521 commit fbaac02
Show file tree
Hide file tree
Showing 17 changed files with 44 additions and 42 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/lint_openapi_schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- name: Get full Python version
id: full-python-version
shell: bash
Expand Down
25 changes: 11 additions & 14 deletions client/src/utils/mountVueComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,21 @@ function getOrCreatePinia() {
// We sometimes use this utility mounting function in a context where there
// is no existing vue application or pinia store (e.g. individual charts
// displayed in an iframe).
// To support both use cases, we will create a new pinia store and attach it to the
// vue application that is created for the component.
let pinia = getActivePinia();
if (!pinia) {
pinia = createPinia();
}
return pinia;
// To support both use cases, we will create a new pinia store and attach it
// to the vue application that is created for the component if missing.
return getActivePinia() || createPinia();
}

export const mountVueComponent = (ComponentDefinition) => {
export function mountVueComponent(ComponentDefinition) {
const component = Vue.extend(ComponentDefinition);
return (propsData, el) => new component({ propsData, el, pinia: getOrCreatePinia() });
};
return function (propsData, el) {
return new component({ propsData, el, pinia: getOrCreatePinia() });
};
}

export const replaceChildrenWithComponent = (el, ComponentDefinition, propsData = {}) => {
export function replaceChildrenWithComponent(el, ComponentDefinition, propsData = {}) {
const container = document.createElement("div");
el.replaceChildren(container);
const component = Vue.extend(ComponentDefinition);
const mountFn = (propsData, el) => new component({ propsData, el, pinia: getOrCreatePinia() });
const mountFn = mountVueComponent(ComponentDefinition);
return mountFn(propsData, container);
};
}
4 changes: 2 additions & 2 deletions config/job_conf.yml.interactivetools
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ execution:

#docker_cmd: /usr/local/custom_docker/docker
#docker_host:
#docker_container_id_override: busybox:ubuntu-14.04
#docker_default_container_id: busybox:ubuntu-14.04
#docker_container_id_override: busybox:1.36.1-glibc
#docker_default_container_id: busybox:1.36.1-glibc
#require_container: true
#container_monitor: true
#container_monitor_result: file
Expand Down
2 changes: 1 addition & 1 deletion doc/source/admin/jobs.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ execution:
k8s_namespace: default
runner: pulsar_k8s
docker_enabled: true
docker_default_container_id: busybox:ubuntu-14.04
docker_default_container_id: busybox:1.36.1-glibc
pulsar_app_config:
message_queue_url: 'amqp://guest:[email protected]:5672//'
local_environment:
Expand Down
4 changes: 2 additions & 2 deletions doc/source/admin/special_topics/interactivetools.rst
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ An example ``job_conf.yml`` file as seen in ``config/job_conf.yml.interactivetoo
#docker_cmd: /usr/local/custom_docker/docker
#docker_host:
#docker_container_id_override: busybox:ubuntu-14.04
#docker_default_container_id: busybox:ubuntu-14.04
#docker_container_id_override: busybox:1.36.1-glibc
#docker_default_container_id: busybox:1.36.1-glibc
#require_container: true
#container_monitor: true
#container_monitor_result: file
Expand Down
2 changes: 1 addition & 1 deletion doc/source/admin/special_topics/mulled_containers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ requirement field.
<requirements>
<!-- Container based dependency handling -->
<container type="docker">busybox:ubuntu-14.04</container>
<container type="docker">busybox:1.36.1-glibc</container>
<!-- Conda based dependency handling -->
<requirement type="package" version="8.22">gnu_coreutils</requirement>
</requirements>
Expand Down
8 changes: 4 additions & 4 deletions lib/galaxy/config/sample/job_conf.sample.yml
Original file line number Diff line number Diff line change
Expand Up @@ -513,13 +513,13 @@ execution:
# trust tool's specified container - a destination wide override
# can be set. This will cause all jobs on this destination to use
# that docker image.
#docker_container_id_override: busybox:ubuntu-14.04
#docker_container_id_override: busybox:1.36.1-glibc

# Likewise, if deployer wants to use docker for isolation and
# does trust tool's specified container - but also wants tool's not
# configured to run in a container the following option can provide
# a fallback. -->
#docker_default_container_id: busybox:ubuntu-14.04
#docker_default_container_id: busybox:1.36.1-glibc

# If the destination should be secured to only allow containerized jobs
# the following parameter may be set for the job destination. Some tools
Expand Down Expand Up @@ -633,7 +633,7 @@ execution:
- type: docker
shell: '/bin/sh'
resolve_dependencies: false
identifier: 'busybox:ubuntu-14.04'
identifier: 'busybox:1.36.1-glibc'
- type: singularity
shell: '/bin/sh'
resolve_dependencies: false
Expand All @@ -642,7 +642,7 @@ execution:
- type: docker
shell: '/bin/sh'
resolve_dependencies: false
identifier: 'busybox:ubuntu-14.04'
identifier: 'busybox:1.36.1-glibc'
- type: singularity
shell: '/bin/sh'
resolve_dependencies: false
Expand Down
10 changes: 5 additions & 5 deletions lib/galaxy/config/sample/job_conf.xml.sample_advanced
Original file line number Diff line number Diff line change
Expand Up @@ -588,13 +588,13 @@
trust tool's specified container - a destination wide override
can be set. This will cause all jobs on this destination to use
that docker image. -->
<!-- <param id="docker_container_id_override">busybox:ubuntu-14.04</param> -->
<!-- <param id="docker_container_id_override">busybox:1.36.1-glibc</param> -->

<!-- Likewise, if deployer wants to use docker for isolation and
does trust tool's specified container - but also wants tool's not
configured to run in a container the following option can provide
a fallback. -->
<!-- <param id="docker_default_container_id">busybox:ubuntu-14.04</param> -->
<!-- <param id="docker_default_container_id">busybox:1.36.1-glibc</param> -->

<!-- If the destination should be secured to only allow containerized jobs
the following parameter may be set for the job destination. Some tools do
Expand Down Expand Up @@ -674,11 +674,11 @@
the enabled container types for this destination will be used.
-->
<param id="container_override">
<container type="docker" shell="/bin/sh" resolve_dependencies="false">busybox:ubuntu-14.04</container>
<container type="docker" shell="/bin/sh" resolve_dependencies="false">busybox:1.36.1-glibc</container>
<container type="singularity" shell="/bin/sh" resolve_dependencies="false">/path/to/default/container</container>
</param>
<param id="container">
<container type="docker" shell="/bin/sh" resolve_dependencies="false">busybox:ubuntu-14.04</container>
<container type="docker" shell="/bin/sh" resolve_dependencies="false">busybox:1.36.1-glibc</container>
<container type="singularity" shell="/bin/sh" resolve_dependencies="false">/path/to/default/container</container>
</param>
</destination>
Expand Down Expand Up @@ -966,7 +966,7 @@
container ID will be passed along to condor as
the docker_image submission parameter.
-->
<!-- <param id="docker_default_container_id">busybox:ubuntu-14.04</param> -->
<!-- <param id="docker_default_container_id">busybox:1.36.1-glibc</param> -->
</destination>

<!-- Jobs can be re-submitted for various reasons (to the same destination or others,
Expand Down
2 changes: 1 addition & 1 deletion test/functional/tools/catDocker.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<tool id="catdc" name="Concatenate datasets (in docker)" version="1.0.0">
<description>tail-to-head</description>
<requirements>
<container type="docker">busybox:ubuntu-14.04</container>
<container type="docker">busybox:1.36.1-glibc</container>
</requirements>
<command><![CDATA[
echo "Galaxy slots passed through contain as \$GALAXY_SLOTS" &&
Expand Down
2 changes: 1 addition & 1 deletion test/functional/tools/job_environment_default.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<tool id="job_environment_default" name="job_environment_default" version="0.1.0" profile="18.01">
<requirements>
<container type="docker">busybox:ubuntu-14.04</container>
<container type="docker">busybox:1.36.1-glibc</container>
</requirements>
<command detect_errors="exit_code"><![CDATA[
mktemp -d &&
Expand Down
2 changes: 1 addition & 1 deletion test/functional/tools/job_environment_default_legacy.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<tool id="job_environment_default_legacy" name="job_environment_default_legacy" version="0.1.0">
<requirements>
<container type="docker">busybox:ubuntu-14.04</container>
<container type="docker">busybox:1.36.1-glibc</container>
</requirements>
<command detect_errors="exit_code"><![CDATA[
mktemp -d &&
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<tool id="job_environment_explicit_isolated_home" name="job_environment_explicit_isolated_home" version="0.1.0">
<requirements>
<container type="docker">busybox:ubuntu-14.04</container>
<container type="docker">busybox:1.36.1-glibc</container>
</requirements>
<command use_shared_home="false"><![CDATA[
mktemp -d &&
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<tool id="job_environment_explicit_shared_home" name="job_environment_explicit_shared_home" version="0.1.0" profile="18.01">
<requirements>
<container type="docker">busybox:ubuntu-14.04</container>
<container type="docker">busybox:1.36.1-glibc</container>
</requirements>
<command use_shared_home="true"><![CDATA[
mktemp -d &&
Expand Down
2 changes: 1 addition & 1 deletion test/functional/tools/tool_directory_docker.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<tool id="tool_directory_docker" name="tool_directory_docker" version="1.0.0">
<requirements>
<container type="docker">busybox:ubuntu-14.04</container>
<container type="docker">busybox:1.36.1-glibc</container>
</requirements>
<command><![CDATA[
cp '$__tool_directory__/tool_directory.xml' output1
Expand Down
6 changes: 3 additions & 3 deletions test/integration/test_coexecution.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
k8s_namespace: ${k8s_namespace}
runner: pulsar_k8s
docker_enabled: true
docker_default_container_id: busybox:ubuntu-14.04
docker_default_container_id: busybox:1.36.1-glibc
pulsar_app_config:
message_queue_url: '${container_amqp_url}'
env:
Expand Down Expand Up @@ -145,7 +145,7 @@ def job_config(template_str: str, jobs_directory: str) -> str:
runner: pulsar_tes
tes_url: ${tes_url}
docker_enabled: true
docker_default_container_id: busybox:ubuntu-14.04
docker_default_container_id: busybox:1.36.1-glibc
pulsar_app_config:
message_queue_url: '${container_amqp_url}'
env:
Expand Down Expand Up @@ -204,7 +204,7 @@ def job_config(template_str: str, jobs_directory: str) -> str:
runner: pulsar_tes
tes_url: ${tes_url}
docker_enabled: true
docker_default_container_id: busybox:ubuntu-14.04
docker_default_container_id: busybox:1.36.1-glibc
pulsar_app_config:
message_queue_url: '${container_amqp_url}'
env:
Expand Down
6 changes: 3 additions & 3 deletions test/integration/test_kubernetes_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,21 +133,21 @@ def job_config(jobs_directory: str) -> Config:
<param id="limits_cpu">1.1</param>
<param id="limits_memory">100M</param>
<param id="docker_enabled">true</param>
<param id="docker_default_container_id">busybox:ubuntu-14.04</param>
<param id="docker_default_container_id">busybox:1.36.1-glibc</param>
<env id="SOME_ENV_VAR">42</env>
</destination>
<destination id="k8s_destination_walltime_short" runner="k8s_walltime_short">
<param id="limits_cpu">1.1</param>
<param id="limits_memory">100M</param>
<param id="docker_enabled">true</param>
<param id="docker_default_container_id">busybox:ubuntu-14.04</param>
<param id="docker_default_container_id">busybox:1.36.1-glibc</param>
<env id="SOME_ENV_VAR">42</env>
</destination>
<destination id="k8s_destination_no_cleanup" runner="k8s_no_cleanup">
<param id="limits_cpu">1.1</param>
<param id="limits_memory">100M</param>
<param id="docker_enabled">true</param>
<param id="docker_default_container_id">busybox:ubuntu-14.04</param>
<param id="docker_default_container_id">busybox:1.36.1-glibc</param>
<env id="SOME_ENV_VAR">42</env>
</destination>
<destination id="local_dest" runner="local">
Expand Down
2 changes: 1 addition & 1 deletion test/unit/app/jobs/test_job_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ def test_container_tag_in_destination(self):
assert len(container) == 2
container0 = container[0]
assert container0["type"] == "docker"
assert container0["identifier"] == "busybox:ubuntu-14.04"
assert container0["identifier"] == "busybox:1.36.1-glibc"

container_override = container_dest.params["container_override"]
assert len(container_override) == 2
Expand Down

0 comments on commit fbaac02

Please sign in to comment.