# HG changeset patch # User wenzelm # Date 1678227962 -3600 # Node ID 643146163fd17902ab0cbb8c37143774f75779f4 # Parent 98b4a9902582239191c21a46c0220b6c8f2bf4fc proper file-name (amending b975f5aaf6b8); diff -r 98b4a9902582 -r 643146163fd1 etc/build.props --- a/etc/build.props Tue Mar 07 23:24:40 2023 +0100 +++ b/etc/build.props Tue Mar 07 23:26:02 2023 +0100 @@ -184,12 +184,12 @@ src/Pure/Thy/thy_header.scala \ src/Pure/Thy/thy_syntax.scala \ src/Pure/Tools/build.scala \ - src/Pure/Tools/build_docker.scala \ src/Pure/Tools/build_job.scala \ src/Pure/Tools/build_process.scala \ src/Pure/Tools/check_keywords.scala \ src/Pure/Tools/debugger.scala \ src/Pure/Tools/doc.scala \ + src/Pure/Tools/docker_build.scala \ src/Pure/Tools/dotnet_setup.scala \ src/Pure/Tools/dump.scala \ src/Pure/Tools/flarum.scala \ diff -r 98b4a9902582 -r 643146163fd1 src/Pure/Tools/build_docker.scala --- a/src/Pure/Tools/build_docker.scala Tue Mar 07 23:24:40 2023 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,178 +0,0 @@ -/* Title: Pure/Tools/docker_build.scala - Author: Makarius - -Build docker image from Isabelle application bundle for Linux. -*/ - -package isabelle - - -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") - - private val Isabelle_Name = """^.*?(Isabelle[^/\\:]+)_linux(?:_arm)?\.tar\.gz$""".r - - val packages: List[String] = - List("curl", "less", "libfontconfig1", "libgomp1", "openssh-client", "pwgen", "rsync") - - val package_collections: Map[String, List[String]] = - Map("X11" -> List("libx11-6", "libxext6", "libxrender1", "libxtst6", "libxi6"), - "latex" -> - List( - "texlive-bibtex-extra", - "texlive-fonts-extra", - "texlive-font-utils", - "texlive-latex-extra", - "texlive-science")) - - def all_packages: List[String] = - packages ::: package_collections.valuesIterator.flatten.toList - - def docker_build(progress: Progress, - app_archive: String, - base: String = default_base, - work_dir: Path = default_work_dir, - logic: String = default_logic, - no_build: Boolean = false, - entrypoint: Boolean = false, - output: Option[Path] = None, - more_packages: List[String] = Nil, - tag: String = "" - ): Unit = { - val isabelle_name = - app_archive match { - case Isabelle_Name(name) => name - case _ => error("Cannot determine Isabelle distribution name from " + app_archive) - } - val is_remote = Url.is_wellformed(app_archive) - - val dockerfile = - """## Dockerfile for """ + isabelle_name + """ - -FROM """ + base + """ -SHELL ["/bin/bash", "-c"] - -# packages -ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get -y update && \ - apt-get install -y """ + Bash.strings(packages ::: more_packages) + """ && \ - apt-get clean - -# user -RUN useradd -m isabelle && (echo isabelle:isabelle | chpasswd) -USER isabelle - -# Isabelle -WORKDIR /home/isabelle -""" + (if (is_remote) - "RUN curl --fail --silent --location " + Bash.string(app_archive) + " > Isabelle.tar.gz" - else "COPY Isabelle.tar.gz .") + """ -RUN tar xzf Isabelle.tar.gz && \ - mv """ + isabelle_name + """ Isabelle && \ - sed -i -e 's,ISABELLE_HOME_USER=.*,ISABELLE_HOME_USER="\$USER_HOME/.isabelle",g;' Isabelle/etc/settings && \ - sed -i -e 's,ISABELLE_LOGIC=.*,ISABELLE_LOGIC=""" + logic + """,g;' Isabelle/etc/settings && \ - Isabelle/bin/isabelle build -o system_heaps -b """ + logic + """ && \ - rm Isabelle.tar.gz""" + (if (entrypoint) """ - -ENTRYPOINT ["Isabelle/bin/isabelle"] -""" else "") - - for (path <- output) { - progress.echo("Dockerfile: " + path.absolute) - File.write(path, dockerfile) - } - - if (!no_build) { - Isabelle_System.make_directory(work_dir) - progress.echo("Docker working directory: " + work_dir.absolute) - - Isabelle_System.with_tmp_dir("docker_build", base_dir = work_dir.file) { tmp_dir => - progress.echo("Docker temporary directory: " + tmp_dir.absolute) - - File.write(tmp_dir + Path.explode("Dockerfile"), dockerfile) - - if (is_remote) { - if (!Url.is_readable(app_archive)) - error("Cannot access remote archive " + app_archive) - } - else { - Isabelle_System.copy_file(Path.explode(app_archive), - tmp_dir + Path.explode("Isabelle.tar.gz")) - } - - val quiet_option = if (progress.verbose) "" else " -q" - val tag_option = if_proper(tag, " -t " + Bash.string(tag)) - progress.bash("docker build" + quiet_option + tag_option + " " + File.bash_path(tmp_dir), - echo = true).check - } - } - } - - - /* Isabelle tool wrapper */ - - val isabelle_tool = - Isabelle_Tool("docker_build", "build Isabelle docker image", - Scala_Project.here, - { args => - var base = default_base - var entrypoint = false - var work_dir = default_work_dir - var logic = default_logic - var no_build = false - var output: Option[Path] = None - var more_packages: List[String] = Nil - var verbose = false - var tag = "" - - val getopts = Getopts(""" -Usage: isabelle docker_build [OPTIONS] APP_ARCHIVE - - Options are: - -B NAME base image (default """ + quote(default_base) + """) - -E set Isabelle/bin/isabelle as entrypoint - -P NAME additional Ubuntu package collection (""" + - package_collections.keySet.toList.sorted.map(quote(_)).mkString(", ") + """) - -W DIR working directory that is accessible to docker, - potentially via snap (default: """ + default_work_dir + """) - -l NAME default logic (default ISABELLE_LOGIC=""" + quote(default_logic) + """) - -n no docker build - -o FILE output generated Dockerfile - -p NAME additional Ubuntu package - -t TAG docker build tag - -v verbose - - Build Isabelle docker image with default logic image, using a standard - Isabelle application archive for Linux (local file or remote URL). -""", - "B:" -> (arg => base = arg), - "E" -> (_ => entrypoint = true), - "P:" -> (arg => - package_collections.get(arg) match { - case Some(ps) => more_packages :::= ps - case None => error("Unknown package collection " + quote(arg)) - }), - "W:" -> (arg => work_dir = Path.explode(arg)), - "l:" -> (arg => logic = arg), - "n" -> (_ => no_build = true), - "o:" -> (arg => output = Some(Path.explode(arg))), - "p:" -> (arg => more_packages ::= arg), - "t:" -> (arg => tag = arg), - "v" -> (_ => verbose = true)) - - val more_args = getopts(args) - val app_archive = - more_args match { - case List(arg) => arg - case _ => getopts.usage() - } - - val progress = new Console_Progress(verbose = verbose) - - 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 98b4a9902582 -r 643146163fd1 src/Pure/Tools/docker_build.scala --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/Pure/Tools/docker_build.scala Tue Mar 07 23:26:02 2023 +0100 @@ -0,0 +1,178 @@ +/* Title: Pure/Tools/docker_build.scala + Author: Makarius + +Build docker image from Isabelle application bundle for Linux. +*/ + +package isabelle + + +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") + + private val Isabelle_Name = """^.*?(Isabelle[^/\\:]+)_linux(?:_arm)?\.tar\.gz$""".r + + val packages: List[String] = + List("curl", "less", "libfontconfig1", "libgomp1", "openssh-client", "pwgen", "rsync") + + val package_collections: Map[String, List[String]] = + Map("X11" -> List("libx11-6", "libxext6", "libxrender1", "libxtst6", "libxi6"), + "latex" -> + List( + "texlive-bibtex-extra", + "texlive-fonts-extra", + "texlive-font-utils", + "texlive-latex-extra", + "texlive-science")) + + def all_packages: List[String] = + packages ::: package_collections.valuesIterator.flatten.toList + + def docker_build(progress: Progress, + app_archive: String, + base: String = default_base, + work_dir: Path = default_work_dir, + logic: String = default_logic, + no_build: Boolean = false, + entrypoint: Boolean = false, + output: Option[Path] = None, + more_packages: List[String] = Nil, + tag: String = "" + ): Unit = { + val isabelle_name = + app_archive match { + case Isabelle_Name(name) => name + case _ => error("Cannot determine Isabelle distribution name from " + app_archive) + } + val is_remote = Url.is_wellformed(app_archive) + + val dockerfile = + """## Dockerfile for """ + isabelle_name + """ + +FROM """ + base + """ +SHELL ["/bin/bash", "-c"] + +# packages +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get -y update && \ + apt-get install -y """ + Bash.strings(packages ::: more_packages) + """ && \ + apt-get clean + +# user +RUN useradd -m isabelle && (echo isabelle:isabelle | chpasswd) +USER isabelle + +# Isabelle +WORKDIR /home/isabelle +""" + (if (is_remote) + "RUN curl --fail --silent --location " + Bash.string(app_archive) + " > Isabelle.tar.gz" + else "COPY Isabelle.tar.gz .") + """ +RUN tar xzf Isabelle.tar.gz && \ + mv """ + isabelle_name + """ Isabelle && \ + sed -i -e 's,ISABELLE_HOME_USER=.*,ISABELLE_HOME_USER="\$USER_HOME/.isabelle",g;' Isabelle/etc/settings && \ + sed -i -e 's,ISABELLE_LOGIC=.*,ISABELLE_LOGIC=""" + logic + """,g;' Isabelle/etc/settings && \ + Isabelle/bin/isabelle build -o system_heaps -b """ + logic + """ && \ + rm Isabelle.tar.gz""" + (if (entrypoint) """ + +ENTRYPOINT ["Isabelle/bin/isabelle"] +""" else "") + + for (path <- output) { + progress.echo("Dockerfile: " + path.absolute) + File.write(path, dockerfile) + } + + if (!no_build) { + Isabelle_System.make_directory(work_dir) + progress.echo("Docker working directory: " + work_dir.absolute) + + Isabelle_System.with_tmp_dir("docker_build", base_dir = work_dir.file) { tmp_dir => + progress.echo("Docker temporary directory: " + tmp_dir.absolute) + + File.write(tmp_dir + Path.explode("Dockerfile"), dockerfile) + + if (is_remote) { + if (!Url.is_readable(app_archive)) + error("Cannot access remote archive " + app_archive) + } + else { + Isabelle_System.copy_file(Path.explode(app_archive), + tmp_dir + Path.explode("Isabelle.tar.gz")) + } + + val quiet_option = if (progress.verbose) "" else " -q" + val tag_option = if_proper(tag, " -t " + Bash.string(tag)) + progress.bash("docker build" + quiet_option + tag_option + " " + File.bash_path(tmp_dir), + echo = true).check + } + } + } + + + /* Isabelle tool wrapper */ + + val isabelle_tool = + Isabelle_Tool("docker_build", "build Isabelle docker image", + Scala_Project.here, + { args => + var base = default_base + var entrypoint = false + var work_dir = default_work_dir + var logic = default_logic + var no_build = false + var output: Option[Path] = None + var more_packages: List[String] = Nil + var verbose = false + var tag = "" + + val getopts = Getopts(""" +Usage: isabelle docker_build [OPTIONS] APP_ARCHIVE + + Options are: + -B NAME base image (default """ + quote(default_base) + """) + -E set Isabelle/bin/isabelle as entrypoint + -P NAME additional Ubuntu package collection (""" + + package_collections.keySet.toList.sorted.map(quote(_)).mkString(", ") + """) + -W DIR working directory that is accessible to docker, + potentially via snap (default: """ + default_work_dir + """) + -l NAME default logic (default ISABELLE_LOGIC=""" + quote(default_logic) + """) + -n no docker build + -o FILE output generated Dockerfile + -p NAME additional Ubuntu package + -t TAG docker build tag + -v verbose + + Build Isabelle docker image with default logic image, using a standard + Isabelle application archive for Linux (local file or remote URL). +""", + "B:" -> (arg => base = arg), + "E" -> (_ => entrypoint = true), + "P:" -> (arg => + package_collections.get(arg) match { + case Some(ps) => more_packages :::= ps + case None => error("Unknown package collection " + quote(arg)) + }), + "W:" -> (arg => work_dir = Path.explode(arg)), + "l:" -> (arg => logic = arg), + "n" -> (_ => no_build = true), + "o:" -> (arg => output = Some(Path.explode(arg))), + "p:" -> (arg => more_packages ::= arg), + "t:" -> (arg => tag = arg), + "v" -> (_ => verbose = true)) + + val more_args = getopts(args) + val app_archive = + more_args match { + case List(arg) => arg + case _ => getopts.usage() + } + + val progress = new Console_Progress(verbose = verbose) + + 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) + }) +}