Unverified Commit 8a52443a authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #18428 from mvdbeek/replace_busybox 

[24.0] Replace busybox:ubuntu-14.04 image with busybox:1.36.1-glibc
parents 2257c22c 7ceef4b2

config/job_conf.yml.interactivetools

+2 −2
Original line number Diff line number Diff line
@@ -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

doc/source/admin/jobs.md

+1 −1
Original line number Diff line number Diff line
@@ -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:

doc/source/admin/special_topics/interactivetools.rst

+2 −2
Original line number Diff line number Diff line
@@ -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

doc/source/admin/special_topics/mulled_containers.rst

+1 −1
Original line number Diff line number Diff line
@@ -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>

lib/galaxy/config/sample/job_conf.sample.yml

+4 −4
Original line number Diff line number Diff line
@@ -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