Allow user of podman as alternative to docker.
This commit is contained in:
parent
1f569f2f74
commit
2cfef2ddfc
7
build.sh
7
build.sh
|
@ -29,12 +29,15 @@ set -e
|
||||||
|
|
||||||
VERSION=${1:-2020}
|
VERSION=${1:-2020}
|
||||||
SESSIONS=${2:-"HOL"}
|
SESSIONS=${2:-"HOL"}
|
||||||
DOCKERUID=${3:-`id -u`}
|
CONTAINER=${3:-docker}
|
||||||
|
DOCKERUID=${4:-`id -u`}
|
||||||
|
|
||||||
LATEST="2020"
|
LATEST="2020"
|
||||||
|
|
||||||
|
export VERSION SESSIONS CONTAINER DOCKERUID LATEST
|
||||||
|
|
||||||
# Generate base image
|
# Generate base image
|
||||||
docker build -t logicalhacking/debian4isabelle debian4isabelle
|
$CONTAINER build -t logicalhacking/debian4isabelle debian4isabelle
|
||||||
|
|
||||||
# Generate Isabelle image(s)
|
# Generate Isabelle image(s)
|
||||||
( cd isabelle && source hooks/build)
|
( cd isabelle && source hooks/build)
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
|
|
||||||
FROM registry.hub.docker.com/library/debian:testing-slim
|
FROM registry.hub.docker.com/library/debian:testing-slim
|
||||||
|
|
||||||
SHELL ["/bin/bash", "-c"]
|
|
||||||
|
|
||||||
# packages
|
# packages
|
||||||
RUN apt-get -y update && \
|
RUN apt-get -y update && \
|
||||||
|
|
|
@ -35,7 +35,6 @@ LABEL isabelle.url="$isabelle"
|
||||||
LABEL isabelle.afp.url="$afp"
|
LABEL isabelle.afp.url="$afp"
|
||||||
LABEL isabelle.sessions="$sessions"
|
LABEL isabelle.sessions="$sessions"
|
||||||
|
|
||||||
SHELL ["/bin/bash", "-c"]
|
|
||||||
|
|
||||||
# Create default user (isabelle)
|
# Create default user (isabelle)
|
||||||
RUN useradd -u $uid -m isabelle && (echo isabelle:isabelle | chpasswd)
|
RUN useradd -u $uid -m isabelle && (echo isabelle:isabelle | chpasswd)
|
||||||
|
|
|
@ -50,7 +50,7 @@ for url in $ISA_URL $AFP_URL/$AFP_TAR; do
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
docker build -t logicalhacking/isabelle$VERSION . \
|
$CONTAINER build -t logicalhacking/isabelle$VERSION . \
|
||||||
--build-arg uid="$DOCKERUID" \
|
--build-arg uid="$DOCKERUID" \
|
||||||
--build-arg sessions="$SESSIONS" \
|
--build-arg sessions="$SESSIONS" \
|
||||||
--build-arg isabelle="$ISA_URL" \
|
--build-arg isabelle="$ISA_URL" \
|
||||||
|
|
|
@ -30,7 +30,6 @@ ARG isadof_version
|
||||||
|
|
||||||
LABEL isadof.version="$isadof_version/Isabelle2019"
|
LABEL isadof.version="$isadof_version/Isabelle2019"
|
||||||
|
|
||||||
SHELL ["/bin/bash", "-c"]
|
|
||||||
|
|
||||||
# Install Isabelle and corresponding AFP
|
# Install Isabelle and corresponding AFP
|
||||||
WORKDIR /home/isabelle
|
WORKDIR /home/isabelle
|
||||||
|
|
|
@ -33,5 +33,5 @@ else
|
||||||
IMAGE="isabelle_dof-"$ISADOF_VERSION"_isabelle2019"
|
IMAGE="isabelle_dof-"$ISADOF_VERSION"_isabelle2019"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
docker build -t logicalhacking/$IMAGE . \
|
$CONTAINER build -t logicalhacking/$IMAGE . \
|
||||||
--build-arg isadof_version="$ISADOF_VERSION"
|
--build-arg isadof_version="$ISADOF_VERSION"
|
||||||
|
|
Loading…
Reference in New Issue