Merge pull request #42 from luca-heltai/unify

Unify Dockerfiles.

Makefile

@@ -79,39 +79,43 @@ v9.4.0-jammy:
 
 dependencies-focal-v9.2.0:
 	$(DOCKER_BUILD) -t dealii/dependencies:focal-v9.2.0 \
+ 		--build-arg IMG=focal \
 		--build-arg VERSION=9.2.0-1~ubuntu20.04.1~ppa1 \
 		--build-arg REPO=ppa:ginggs/deal.ii-9.2.0-backports \
 		--build-arg CLANG_VERSION=6 \
 		--build-arg CLANG_REPO=https://github.com/dealii/dealii/releases/download/v9.0.0/ \
-		dependencies-focal
+		dependencies
 	docker push dealii/dependencies:focal-v9.2.0
 
 dependencies-focal-v9.3.0:
 	$(DOCKER_BUILD) -t dealii/dependencies:focal-v9.3.0 \
+ 		--build-arg IMG=focal \
 		--build-arg VERSION=9.3.0-1~ubuntu20.04.1~ppa1 \
 		--build-arg REPO=ppa:ginggs/deal.ii-9.3.0-backports \
 		--build-arg CLANG_VERSION=11 \
 		--build-arg CLANG_REPO=https://github.com/dealii/dealii/releases/download/v9.3.0/ \
-		dependencies-focal
+		dependencies
 	docker tag dealii/dependencies:focal dealii/dependencies:focal-v9.3.0
 	docker push dealii/dependencies:focal-v9.3.0
 
 dependencies-focal:
 	$(DOCKER_BUILD) -t dealii/dependencies:focal \
+		--build-arg IMG=focal \
                 --build-arg VERSION=9.4.0-1ubuntu2~bpo20.04.1~ppa1 \
                 --build-arg REPO=ppa:ginggs/deal.ii-9.4.0-backports \
                 --build-arg CLANG_VERSION=11 \
                 --build-arg CLANG_REPO=https://github.com/dealii/dealii/releases/download/v9.3.0/ \
-                dependencies-focal
+                dependencies
 	docker push dealii/dependencies:focal
 
 dependencies-jammy:
 	$(DOCKER_BUILD) -t dealii/dependencies:jammy \
+		--build-arg IMG=jammy \
                 --build-arg VERSION=9.4.0-1ubuntu2~bpo22.04.1~ppa1 \
                 --build-arg REPO=ppa:ginggs/deal.ii-9.4.0-backports \
                 --build-arg CLANG_VERSION=11 \
                 --build-arg CLANG_REPO=https://github.com/dealii/dealii/releases/download/v9.3.0/ \
-                dependencies-jammy
+                dependencies
 	docker push dealii/dependencies:jammy
 	docker tag dealii/dependencies:jammy dealii/dependencies:latest
 	docker tag dealii/dependencies:jammy dealii/dependencies:jammy-v9.4.0
@@ -133,14 +137,32 @@ v9.4.2-jammy:
 		--build-arg PROCS=80 \
 		github
 	docker push dealii/dealii:v9.4.2-jammy
-	docker tag dealii/dealii:v9.4.2-jammy dealii/dealii:latest
+
+v9.5.0-focal:
+	$(DOCKER_BUILD) -t dealii/dealii:v9.5.0-focal \
+                --build-arg IMG=focal \
+                --build-arg VER=v9.5.0 \
+                --build-arg PROCS=12 \
+                github
+	docker push dealii/dealii:v9.5.0-focal
+
+v9.5.0-jammy:
+	$(DOCKER_BUILD) -t dealii/dealii:v9.5.0-jammy \
+                --build-arg IMG=jammy \
+                --build-arg VER=v9.5.0 \
+                --build-arg PROCS=12 \
+                github
+	docker push dealii/dealii:v9.5.0-jammy
+	docker tag dealii/dealii:v9.5.0-jammy dealii/dealii:latest
 	docker push dealii/dealii:latest
 
-all: dependencies-focal v9.4.2-focal dependencies-jammy v9.4.2-jammy 
+all: dependencies-focal v9.5.0-focal dependencies-jammy v9.5.0-jammy 
 
 .PHONY: all \
 	v9.1.1-bionic v9.2.0-bionic \
 	v9.2.0-focal v9.3.0-focal v9.4.0-focal v9.4.1-focal v9.4.2-focal \
+	v9.5.0-focal \
 	v9.4.0-jammy v9.4.1-jammy v9.4.2-jammy \
+	v9.5.0-jammy \
 	dependencies-focal-v9.2.0 dependencies-focal-v9.3.0 dependencies-focal \
 	dependencies-jammy

dependencies-jammy/Dockerfile → dependencies/Dockerfile

@@ -1,4 +1,6 @@
-FROM ubuntu:jammy
+ARG IMG=jammy
+
+FROM ubuntu:$IMG
 
 LABEL maintainer="[email protected]"
 
@@ -8,10 +10,12 @@ ARG CLANG_VERSION=11
 ARG CLANG_REPO=https://github.com/dealii/dealii/releases/download/v9.3.0/
 
 USER root
+ENV DEBIAN_FRONTEND=noninteractive 
+
 RUN apt-get update && apt-get install -y software-properties-common \
     && add-apt-repository $REPO \
     && apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    apt-get install -y \
     git \
     libboost-dev \
     libboost-python-dev \