diff --git a/.github/workflows/lint_openapi_schema.yml b/.github/workflows/lint_openapi_schema.yml
index 464d1cef825f..4269db840770 100644
--- a/.github/workflows/lint_openapi_schema.yml
+++ b/.github/workflows/lint_openapi_schema.yml
@@ -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
diff --git a/client/src/utils/mountVueComponent.js b/client/src/utils/mountVueComponent.js
index 754f2bfd1b48..2e47c3cabbee 100644
--- a/client/src/utils/mountVueComponent.js
+++ b/client/src/utils/mountVueComponent.js
@@ -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);
-};
+}
diff --git a/config/job_conf.yml.interactivetools b/config/job_conf.yml.interactivetools
index dfc00fb46b46..5ac519ebd4f2 100644
--- a/config/job_conf.yml.interactivetools
+++ b/config/job_conf.yml.interactivetools
@@ -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
diff --git a/doc/source/admin/jobs.md b/doc/source/admin/jobs.md
index 5d87c9c429c9..dcb7f75a3f74 100644
--- a/doc/source/admin/jobs.md
+++ b/doc/source/admin/jobs.md
@@ -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:guest@host.docker.internal:5672//'
local_environment:
diff --git a/doc/source/admin/special_topics/interactivetools.rst b/doc/source/admin/special_topics/interactivetools.rst
index 698c2d1d3d73..6d032c02d05c 100644
--- a/doc/source/admin/special_topics/interactivetools.rst
+++ b/doc/source/admin/special_topics/interactivetools.rst
@@ -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
diff --git a/doc/source/admin/special_topics/mulled_containers.rst b/doc/source/admin/special_topics/mulled_containers.rst
index 38e883667c53..332a9806b73d 100644
--- a/doc/source/admin/special_topics/mulled_containers.rst
+++ b/doc/source/admin/special_topics/mulled_containers.rst
@@ -16,7 +16,7 @@ requirement field.
- busybox:ubuntu-14.04
+ busybox:1.36.1-glibc
gnu_coreutils
diff --git a/lib/galaxy/config/sample/job_conf.sample.yml b/lib/galaxy/config/sample/job_conf.sample.yml
index 27f8522ecfef..849aabba1eec 100644
--- a/lib/galaxy/config/sample/job_conf.sample.yml
+++ b/lib/galaxy/config/sample/job_conf.sample.yml
@@ -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
@@ -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
@@ -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
diff --git a/lib/galaxy/config/sample/job_conf.xml.sample_advanced b/lib/galaxy/config/sample/job_conf.xml.sample_advanced
index bf6b739175d5..dc67a4763d74 100644
--- a/lib/galaxy/config/sample/job_conf.xml.sample_advanced
+++ b/lib/galaxy/config/sample/job_conf.xml.sample_advanced
@@ -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. -->
-
+
-
+
- busybox:ubuntu-14.04
+ busybox:1.36.1-glibc
/path/to/default/container
- busybox:ubuntu-14.04
+ busybox:1.36.1-glibc
/path/to/default/container
@@ -966,7 +966,7 @@
container ID will be passed along to condor as
the docker_image submission parameter.
-->
-
+