lh-docker
/
lh-docker-isabelle
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use official release archive for generating Docker images.
lh-docker/lh-docker-isabelle/master This commit looks good Details

This commit is contained in:
Achim D. Brucker 2019-08-18 16:42:12 +01:00
parent 3d49783668
commit 95ec2a3f0c
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -40,5 +40,5 @@ docker build -t logicalhacking/debian4isabelle debian4isabelle
( cd isabelle && source hooks/build) ( cd isabelle && source hooks/build)
# Generate Isabelle/DOF image # Generate Isabelle/DOF image
# ISADOF_VERSION=1.0.0 ISADOF_VERSION=1.0.0
( cd isabelle_dof && source hooks/build) ( cd isabelle_dof && source hooks/build)

13
isabelle_dof/Dockerfile
View File

@ -26,9 +26,9 @@
FROM logicalhacking/isabelle2019 FROM logicalhacking/isabelle2019
ARG tag ARG isadof_version
LABEL isadof.tag="$tag" LABEL isadof.version="$isadof_version/Isabelle2019"
SHELL ["/bin/bash", "-c"] SHELL ["/bin/bash", "-c"]
@ -41,8 +41,13 @@ RUN apt-get -y update && apt-get install -y imagemagick && \
rm -rf /usr/share/doc rm -rf /usr/share/doc
USER isabelle USER isabelle
RUN git clone https://git.logicalhacking.com/Isabelle_DOF/Isabelle_DOF.git && \ RUN if [[ -z "$isadof_version" ]]; then \
(cd Isabelle_DOF && git checkout "$tag") && \ git clone https://git.logicalhacking.com/Isabelle_DOF/Isabelle_DOF.git && \
(cd Isabelle_DOF && git checkout master) \
else \
curl -s -L https://artifacts.logicalhacking.com/releases/Isabelle_DOF/Isabelle_DOF/Isabelle_DOF-"$isadof_version"_Isabelle2019.tar.xz | tar Jxf - && \
ln -s Isabelle_DOF-"$isadof_version"_Isabelle2019 Isabelle_DOF; \
fi && \
(cd Isabelle_DOF && ./install) && \ (cd Isabelle_DOF && ./install) && \
(cd Isabelle_DOF && isabelle build -D .) && \ (cd Isabelle_DOF && isabelle build -D .) && \
echo "ISABELLE_LOGIC=Isabelle_DOF" >> Isabelle/etc/settings && \ echo "ISABELLE_LOGIC=Isabelle_DOF" >> Isabelle/etc/settings && \

8
isabelle_dof/hooks/build
View File

@ -28,12 +28,10 @@
set -e set -e
if [ -z "$ISADOF_VERSION" ] ; then if [ -z "$ISADOF_VERSION" ] ; then
IMAGE="isadof" IMAGE="isabelle_dof"
TAG="master"
else else
TAG="v"$VERSION"/Isabelle2019" IMAGE="isabelle_dof-"$ISADOF_VERSION"_isabelle2019"
IMAGE="Isabelle_DOF-"$ISADOF_VERSION"_Isabelle2019"
fi fi
docker build -t logicalhacking/$IMAGE . \ docker build -t logicalhacking/$IMAGE . \
--build-arg tag="$TAG" --build-arg isadof_version="$ISADOF_VERSION"