Updated default version to Isabelle 2022.

build.sh

@@ -39,5 +39,5 @@ export IMAGE_NAME=logicalhacking/isabelle$VERSION
 ( cd isabelle && source hooks/build)
 
 # Generate Isabelle/DOF image
-ISADOF_VERSION=1.0.0
-( cd isabelle_dof && source hooks/build)
+#ISADOF_VERSION=1.0.0
+#( cd isabelle_dof && source hooks/build)

config

@@ -27,8 +27,9 @@
 
 set -e 
 
-VERSION=${1:-2021}
+VERSION=${1:-2022}
 SESSIONS=${2:-"HOL"}
 CONTAINER=${3:-docker}
 DOCKERUID=${4:-`id -u`}
-LATEST="2021"
+LATEST="2022"
+CONTAINER=podman

debian4isabelle/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2020 Achim D. Brucker, https://brucker.ch
+# Copyright (c) 2019-2022 Achim D. Brucker, https://brucker.ch
 #
 # All rights reserved.
 #
@@ -24,7 +24,7 @@
 #
 # SPDX-License-Identifier: BSD-2-Clause
 
-FROM registry.hub.docker.com/library/debian:testing-slim
+FROM registry.hub.docker.com/library/debian:unstable-slim
 
 
 # packages
@@ -35,7 +35,9 @@ RUN apt-get -y update && \
       # useful utilities 
       git mercurial \
       # texlive for Isabelle's PDF document generation
-      texlive-latex-extra texlive-fonts-extra texlive-publishers \
+      texlive-full \
+      # Python tools and graphviz for add-ons
+      python3-pip graphviz pipenv python3-sklearn-pandas python3-seaborn jupyter-nbconvert \
       && \
   apt-get clean && \
   rm -rf /usr/share/doc
@@ -43,11 +45,9 @@ RUN apt-get -y update && \
 RUN curl -o /tmp/generic.zip http://www.entcs.org/generic.zip && \
     mkdir -p /usr/local/share/texmf/tex/latex/ && \
     cd /tmp && unzip generic.zip && mv generic /usr/local/share/texmf/tex/latex/entcs && \
-    curl -o /tmp/lncs.zip ftp://ftp.springernature.com/cs-proceeding/llncs/llncs2e.zip && \
-    mkdir -p /usr/local/share/texmf/tex/latex/llncs && \
+    curl -o /tmp/lipics.tgz https://submission.dagstuhl.de/styles/download-tag/lipics/v2021.1.2/authors/tgz && \
+    cd /tmp && tar zxvf lipics.tgz && mv *authors* /usr/local/share/texmf/tex/latex/lipics && \
     mkdir -p /usr/local/share/texmf/bibtex/bst && \
-    mkdir -p /tmp/lncs && \
-    cd /tmp/lncs && unzip /tmp/lncs.zip && mv *.cls /usr/local/share/texmf/tex/latex/llncs && mv *.bst /usr/local/share/texmf/bibtex/bst && \
     mkdir -p /usr/local/share/texmf/tex/latex/sig-alternate && \
     curl -o /usr/local/share/texmf/tex/latex/sig-alternate/sig-alternate.cls https://www.acm.org/binaries/content/assets/publications/article-templates/sig-alternate-05-2015.cls && \ 
     curl -o /usr/local/share/texmf/tex/latex/sig-alternate/acmcopyright.sty https://www.acm.org/binaries/content/assets/publications/article-templates/acmcopyright.sty

isabelle/hooks/build

@@ -43,11 +43,17 @@ if [ "$LATEST" == "$VERSION" ]; then
   AFP_TAR=`curl -s $AFP_URL  | grep "afp-[0-9]" | sed -e 's|^.*href="\(.*\)">.*$|\1|;s|".*$||' | sort -r | head -1`
 
 else
-    # URL for determining name of archive:
-    AFP_URL="https://sourceforge.net/projects/afp/files/afp-Isabelle$VERSION/"
-    AFP_TAR=`curl -L -s $AFP_URL  | grep "afp-[0-9].*[a-z]</span" | sed -e 's|^.*>\(afp-.*\)</s.*$|\1|' | sort -r | head -1`
-    # URL for direct download    
-    AFP_URL="https://downloads.sourceforge.net/project/afp/afp-Isabelle$VERSION"
+    if [ "2021" == "$VERSION" ]; then
+        # special case, as AFP for Isabelle 2021 is not tagged on sourceforge.net
+        AFP_TAR="afp-2021-11-26.tar.gz"
+        AFP_URL="https://www.isa-afp.org/release/"
+    else
+        # URL for determining name of archive:
+        AFP_URL="https://sourceforge.net/projects/afp/files/afp-Isabelle$VERSION/"
+        AFP_TAR=`curl -L -s $AFP_URL  | grep "afp-[0-9].*[a-z]</span" | sed -e 's|^.*>\(afp-.*\)</s.*$|\1|' | sort -r | head -1`
+        # URL for direct download    
+        AFP_URL="https://downloads.sourceforge.net/project/afp/afp-Isabelle$VERSION"
+    fi
 fi
 
 for url in $ISA_URL $AFP_URL/$AFP_TAR; do