# HG changeset patch # User wenzelm # Date 1678226572 -3600 # Node ID b975f5aaf6b80459e319cd7924ebc8e769c7e13d # Parent 2a99fcb283eed84b5693db2e2f777cd2ec7c96a9 renamed "isabelle build_docker" to "isabelle docker_build" (unrelated to "isabelle build"); diff -r 2a99fcb283ee -r b975f5aaf6b8 NEWS --- a/NEWS Tue Mar 07 22:54:44 2023 +0100 +++ b/NEWS Tue Mar 07 23:02:52 2023 +0100 @@ -273,6 +273,10 @@ * The command-line tool "isabelle log" has been renamed to "isabelle build_log", to emphasize its relation to "isabelle build". +* The command-line tool "isabelle build_docker" has been renamed to +"isabelle docker_build", to emphasize its non-relation to "isabelle +build". + * System option "ML_process_policy" has been renamed to "process_policy", as it may affect other processes as well (notably in "isabelle build"). diff -r 2a99fcb283ee -r b975f5aaf6b8 src/Doc/System/Misc.thy --- a/src/Doc/System/Misc.thy Tue Mar 07 22:54:44 2023 +0100 +++ b/src/Doc/System/Misc.thy Tue Mar 07 23:02:52 2023 +0100 @@ -31,11 +31,11 @@ as Docker images in the first place. \<^medskip> - The @{tool_def build_docker} tool builds docker images from a standard + The @{tool_def docker_build} tool builds docker images from a standard Isabelle application archive for Linux: @{verbatim [display] -\Usage: isabelle build_docker [OPTIONS] APP_ARCHIVE +\Usage: isabelle docker_build [OPTIONS] APP_ARCHIVE Options are: -B NAME base image (default "ubuntu:22.04") @@ -79,7 +79,7 @@ of \<^verbatim>\apt-get install\ within the underlying Linux distribution. Option \<^verbatim>\-P\ refers to high-level package collections: \<^verbatim>\X11\ or \<^verbatim>\latex\ as - provided by \<^verbatim>\isabelle build_docker\ (assuming Ubuntu 20.04 LTS). This + provided by \<^verbatim>\isabelle docker_build\ (assuming Ubuntu 20.04 LTS). This imposes extra weight on the resulting Docker images. Note that \<^verbatim>\X11\ will only provide remote X11 support according to the modest GUI quality standards of the late 1990-ies. @@ -105,14 +105,14 @@ text \ Produce a Dockerfile (without image) from a remote Isabelle distribution: @{verbatim [display] -\ isabelle build_docker -E -n -o Dockerfile +\ isabelle docker_build -E -n -o Dockerfile https://isabelle.in.tum.de/website-Isabelle2022/dist/Isabelle2022_linux.tar.gz\} Build a standard Isabelle Docker image from a local Isabelle distribution, with \<^verbatim>\bin/isabelle\ as executable entry point: @{verbatim [display] -\ isabelle build_docker -E -t test/isabelle:Isabelle2022 Isabelle2022_linux.tar.gz\} +\ isabelle docker_build -E -t test/isabelle:Isabelle2022 Isabelle2022_linux.tar.gz\} Invoke the raw Isabelle/ML process within that image: @{verbatim [display] diff -r 2a99fcb283ee -r b975f5aaf6b8 src/Pure/System/isabelle_tool.scala --- a/src/Pure/System/isabelle_tool.scala Tue Mar 07 22:54:44 2023 +0100 +++ b/src/Pure/System/isabelle_tool.scala Tue Mar 07 23:02:52 2023 +0100 @@ -123,9 +123,9 @@ Build.isabelle_tool1, Build.isabelle_tool2, Build.isabelle_tool3, - Build_Docker.isabelle_tool, CI_Build.isabelle_tool, Doc.isabelle_tool, + Docker_Build.isabelle_tool, Document_Build.isabelle_tool, Dotnet_Setup.isabelle_tool, Dump.isabelle_tool, diff -r 2a99fcb283ee -r b975f5aaf6b8 src/Pure/Tools/build_docker.scala --- a/src/Pure/Tools/build_docker.scala Tue Mar 07 22:54:44 2023 +0100 +++ b/src/Pure/Tools/build_docker.scala Tue Mar 07 23:02:52 2023 +0100 @@ -1,4 +1,4 @@ -/* Title: Pure/Tools/build_docker.scala +/* Title: Pure/Tools/docker_build.scala Author: Makarius Build docker image from Isabelle application bundle for Linux. @@ -7,7 +7,7 @@ package isabelle -object Build_Docker { +object Docker_Build { private val default_base = "ubuntu:22.04" private val default_work_dir = Path.current private lazy val default_logic = Isabelle_System.getenv("ISABELLE_LOGIC") @@ -30,7 +30,7 @@ def all_packages: List[String] = packages ::: package_collections.valuesIterator.flatten.toList - def build_docker(progress: Progress, + def docker_build(progress: Progress, app_archive: String, base: String = default_base, work_dir: Path = default_work_dir, @@ -114,7 +114,7 @@ /* Isabelle tool wrapper */ val isabelle_tool = - Isabelle_Tool("build_docker", "build Isabelle docker image", + Isabelle_Tool("docker_build", "build Isabelle docker image", Scala_Project.here, { args => var base = default_base @@ -128,7 +128,7 @@ var tag = "" val getopts = Getopts(""" -Usage: isabelle build_docker [OPTIONS] APP_ARCHIVE +Usage: isabelle docker_build [OPTIONS] APP_ARCHIVE Options are: -B NAME base image (default """ + quote(default_base) + """) @@ -171,7 +171,7 @@ val progress = new Console_Progress(verbose = verbose) - build_docker(progress, app_archive, base = base, work_dir = work_dir, + docker_build(progress, app_archive, base = base, work_dir = work_dir, logic = logic, no_build = no_build, entrypoint = entrypoint, output = output, more_packages = more_packages, tag = tag) }) diff -r 2a99fcb283ee -r b975f5aaf6b8 src/Pure/Tools/phabricator.scala --- a/src/Pure/Tools/phabricator.scala Tue Mar 07 22:54:44 2023 +0100 +++ b/src/Pure/Tools/phabricator.scala Tue Mar 07 23:02:52 2023 +0100 @@ -21,7 +21,7 @@ /* required packages */ val packages_ubuntu_20_04: List[String] = - Build_Docker.packages ::: + Docker_Build.packages ::: List( // https://secure.phabricator.com/source/phabricator/browse/master/scripts/install/install_ubuntu.sh 15e6e2adea61 "git", "mysql-server", "apache2", "libapache2-mod-php", "php", "php-mysql",