Browse Source

Allow user of podman as alternative to docker.

master
Achim D. Brucker 3 months ago
parent
commit
2cfef2ddfc
6 changed files with 7 additions and 7 deletions
  1. +5
    -2
      build.sh
  2. +0
    -1
      debian4isabelle/Dockerfile
  3. +0
    -1
      isabelle/Dockerfile
  4. +1
    -1
      isabelle/hooks/build
  5. +0
    -1
      isabelle_dof/Dockerfile
  6. +1
    -1
      isabelle_dof/hooks/build

+ 5
- 2
build.sh View File

@@ -29,12 +29,15 @@ set -e

VERSION=${1:-2020}
SESSIONS=${2:-"HOL"}
DOCKERUID=${3:-`id -u`}
CONTAINER=${3:-docker}
DOCKERUID=${4:-`id -u`}

LATEST="2020"

export VERSION SESSIONS CONTAINER DOCKERUID LATEST

# Generate base image
docker build -t logicalhacking/debian4isabelle debian4isabelle
$CONTAINER build -t logicalhacking/debian4isabelle debian4isabelle

# Generate Isabelle image(s)
( cd isabelle && source hooks/build)


+ 0
- 1
debian4isabelle/Dockerfile View File

@@ -26,7 +26,6 @@

FROM registry.hub.docker.com/library/debian:testing-slim

SHELL ["/bin/bash", "-c"]

# packages
RUN apt-get -y update && \


+ 0
- 1
isabelle/Dockerfile View File

@@ -35,7 +35,6 @@ LABEL isabelle.url="$isabelle"
LABEL isabelle.afp.url="$afp"
LABEL isabelle.sessions="$sessions"

SHELL ["/bin/bash", "-c"]

# Create default user (isabelle)
RUN useradd -u $uid -m isabelle && (echo isabelle:isabelle | chpasswd)


+ 1
- 1
isabelle/hooks/build View File

@@ -50,7 +50,7 @@ for url in $ISA_URL $AFP_URL/$AFP_TAR; do
fi
done

docker build -t logicalhacking/isabelle$VERSION . \
$CONTAINER build -t logicalhacking/isabelle$VERSION . \
--build-arg uid="$DOCKERUID" \
--build-arg sessions="$SESSIONS" \
--build-arg isabelle="$ISA_URL" \


+ 0
- 1
isabelle_dof/Dockerfile View File

@@ -30,7 +30,6 @@ ARG isadof_version

LABEL isadof.version="$isadof_version/Isabelle2019"

SHELL ["/bin/bash", "-c"]

# Install Isabelle and corresponding AFP
WORKDIR /home/isabelle


+ 1
- 1
isabelle_dof/hooks/build View File

@@ -33,5 +33,5 @@ else
IMAGE="isabelle_dof-"$ISADOF_VERSION"_isabelle2019"
fi

docker build -t logicalhacking/$IMAGE . \
$CONTAINER build -t logicalhacking/$IMAGE . \
--build-arg isadof_version="$ISADOF_VERSION"

Loading…
Cancel
Save