Refactor dockerfiles (#59)

* Added a base docker image
effect-handlers · Jun 11, 2024 · 6e4c3bf · 6e4c3bf
1 parent 69858c0
commit 6e4c3bf
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 223 deletions.
diff --git a/Makefile b/Makefile
@@ -2,8 +2,11 @@ DOCKERHUB=effecthandlers/effect-handlers
 
 all: bench_eff bench_hia bench_koka bench_links bench_ocaml
 
+system_base:
+	docker build -t $(DOCKERHUB):base systems
+
 # Eff in ocaml
-system_eff:
+system_eff: system_base
 	docker build -t $(DOCKERHUB):eff systems/eff
 
 bench_eff: system_eff
@@ -15,7 +18,7 @@ test_eff: system_eff
 		make -C /source/benchmarks/eff test
 
 # Effekt
-system_effekt:
+system_effekt: system_base
 	docker build -t $(DOCKERHUB):effekt systems/effekt
 
 bench_effekt: system_effekt
@@ -27,7 +30,7 @@ test_effekt: system_effekt
 		make -C /source/benchmarks/effekt test
 
 # Handlers in Action
-system_hia:
+system_hia: system_base
 	docker build -t $(DOCKERHUB):hia systems/hia
 
 bench_hia: system_hia
@@ -39,7 +42,7 @@ test_hia: system_hia
 		make -C /source/benchmarks/hia test
 
 # Koka
-system_koka:
+system_koka: system_base
 	docker build -t effecthandlers/effect-handlers:koka systems/koka
 
 bench_koka: system_koka
@@ -51,7 +54,7 @@ test_koka: system_koka
 		make -C /source/benchmarks/koka test
 
 # libmpeff
-system_libmpeff:
+system_libmpeff: system_base
 	docker build -t $(DOCKERHUB):libmpeff systems/libmpeff
 
 bench_libmpeff: system_libmpeff
@@ -63,7 +66,7 @@ test_libmpeff: system_libmpeff
 		make -C /source/benchmarks/libmpeff test
 
 # Links
-system_links:
+system_links: system_base
 	docker build -t $(DOCKERHUB):links systems/links
 
 bench_links: system_links
@@ -75,7 +78,7 @@ test_links: system_links
 		make -C /source/benchmarks/links test
 
 # libhandler
-system_libhandler:
+system_libhandler: system_base
 	docker build -t $(DOCKERHUB):libhandler systems/libhandler
 
 bench_libhandler: system_libhandler
@@ -87,7 +90,7 @@ test_libhandler: system_libhandler
 		make -C /source/benchmarks/libhandler test
 
 # Multicore OCaml
-system_ocaml:
+system_ocaml: system_base
 	docker build -t $(DOCKERHUB):ocaml systems/ocaml
 
 bench_ocaml: system_ocaml

diff --git a/systems/Dockerfile b/systems/Dockerfile
@@ -0,0 +1,30 @@
+FROM ubuntu:22.04
+
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN true
+
+# Get the basic stuff
+RUN apt-get update && \
+    apt-get -y upgrade && \
+    apt-get install -y \
+    sudo
+
+# Create ubuntu user with sudo privileges
+RUN useradd -ms /bin/bash ubuntu && \
+    usermod -aG sudo ubuntu
+# New added for disable sudo password
+RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+# Set as default user
+USER ubuntu
+WORKDIR /home/ubuntu
+
+# Install hyperfine
+RUN sudo apt install -y wget
+RUN export bleah=$(arch); wget https://github.com/sharkdp/hyperfine/releases/download/v1.15.0/hyperfine_1.15.0_amd64.deb
+RUN sudo dpkg -i hyperfine_1.15.0_amd64.deb
+
+# Configure tzdata
+RUN echo 'tzdata tzdata/Areas select Europe' | sudo debconf-set-selections
+RUN echo 'tzdata tzdata/Zones/Europe select London' | sudo debconf-set-selections
+RUN sudo apt-get install -qqy --no-install-recommends tzdata
diff --git a/systems/eff/Dockerfile b/systems/eff/Dockerfile
@@ -1,28 +1,4 @@
-FROM ubuntu:22.04
-
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
-
-# Get the basic stuff
-RUN apt-get update && \
-    apt-get -y upgrade && \
-    apt-get install -y \
-    sudo
-
-# Create ubuntu user with sudo privileges
-RUN useradd -ms /bin/bash ubuntu && \
-    usermod -aG sudo ubuntu
-# New added for disable sudo password
-RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-# Set as default user
-USER ubuntu
-WORKDIR /home/ubuntu
-
-# Install hyperfine
-RUN sudo apt install -y wget
-RUN wget https://github.com/sharkdp/hyperfine/releases/download/v1.15.0/hyperfine_1.15.0_amd64.deb
-RUN sudo dpkg -i hyperfine_1.15.0_amd64.deb
+FROM effecthandlers/effect-handlers:base
 
 # Install OCaml
 RUN sudo apt install -y wget git curl gcc make m4 unzip bubblewrap bzip2

diff --git a/systems/effekt/Dockerfile b/systems/effekt/Dockerfile
@@ -1,28 +1,4 @@
-FROM ubuntu:22.04
-
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
-
-# Get the basic stuff
-RUN apt-get update && \
-    apt-get -y upgrade && \
-    apt-get install -y \
-    sudo
-
-# Create ubuntu user with sudo privileges
-RUN useradd -ms /bin/bash ubuntu && \
-    usermod -aG sudo ubuntu
-# New added for disable sudo password
-RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-# Set as default user
-USER ubuntu
-WORKDIR /home/ubuntu
-
-# Install hyperfine
-RUN sudo apt install -y wget
-RUN wget https://github.com/sharkdp/hyperfine/releases/download/v1.15.0/hyperfine_1.15.0_amd64.deb
-RUN sudo dpkg -i hyperfine_1.15.0_amd64.deb
+FROM effecthandlers/effect-handlers:base
 
 # Install Effekt
 RUN sudo apt install -y wget

diff --git a/systems/hia/Dockerfile b/systems/hia/Dockerfile
@@ -1,28 +1,4 @@
-FROM ubuntu:22.04
-
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
-
-# Get the basic stuff
-RUN apt-get update && \
-    apt-get -y upgrade && \
-    apt-get install -y \
-    sudo
-
-# Create ubuntu user with sudo privileges
-RUN useradd -ms /bin/bash ubuntu && \
-    usermod -aG sudo ubuntu
-# New added for disable sudo password
-RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-# Set as default user
-USER ubuntu
-WORKDIR /home/ubuntu
-
-# Install hyperfine
-RUN sudo apt install -y wget
-RUN wget https://github.com/sharkdp/hyperfine/releases/download/v1.15.0/hyperfine_1.15.0_amd64.deb
-RUN sudo dpkg -i hyperfine_1.15.0_amd64.deb
+FROM effecthandlers/effect-handlers:base
 
 # Install GHC 8.6.5
 RUN sudo apt install -y git wget curl build-essential libgmp-dev libtinfo-dev

diff --git a/systems/koka/Dockerfile b/systems/koka/Dockerfile
@@ -1,33 +1,4 @@
-FROM ubuntu:22.04
-
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
-
-# Get the basic stuff
-RUN apt-get update && \
-    apt-get -y upgrade && \
-    apt-get install -y \
-    sudo
-
-# Create ubuntu user with sudo privileges
-RUN useradd -ms /bin/bash ubuntu && \
-    usermod -aG sudo ubuntu
-# New added for disable sudo password
-RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-# Set as default user
-USER ubuntu
-WORKDIR /home/ubuntu
-
-# Install hyperfine
-RUN sudo apt install -y wget
-RUN wget https://github.com/sharkdp/hyperfine/releases/download/v1.15.0/hyperfine_1.15.0_amd64.deb
-RUN sudo dpkg -i hyperfine_1.15.0_amd64.deb
-
-# Configure tzdata
-RUN echo 'tzdata tzdata/Areas select Europe' | sudo debconf-set-selections
-RUN echo 'tzdata tzdata/Zones/Europe select London' | sudo debconf-set-selections
-RUN sudo apt-get install -qqy --no-install-recommends tzdata
+FROM effecthandlers/effect-handlers:base
 
 # Install Koka
 RUN sudo apt install -y curl

diff --git a/systems/libhandler/Dockerfile b/systems/libhandler/Dockerfile
@@ -1,28 +1,4 @@
-FROM ubuntu:22.04
-
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
-
-# Get the basic stuff
-RUN apt-get update && \
-    apt-get -y upgrade && \
-    apt-get install -y \
-    sudo
-
-# Create ubuntu user with sudo privileges
-RUN useradd -ms /bin/bash ubuntu && \
-    usermod -aG sudo ubuntu
-# New added for disable sudo password
-RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-# Set as default user
-USER ubuntu
-WORKDIR /home/ubuntu
-
-# Install hyperfine
-RUN sudo apt install -y wget
-RUN wget https://github.com/sharkdp/hyperfine/releases/download/v1.15.0/hyperfine_1.15.0_amd64.deb
-RUN sudo dpkg -i hyperfine_1.15.0_amd64.deb
+FROM effecthandlers/effect-handlers:base
 
 # Install libhandler
 RUN sudo apt install -y wget git curl gcc make m4

diff --git a/systems/libmpeff/Dockerfile b/systems/libmpeff/Dockerfile
@@ -1,33 +1,4 @@
-FROM ubuntu:22.04
-
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
-
-# Get the basic stuff
-RUN apt-get update && \
-    apt-get -y upgrade && \
-    apt-get install -y \
-    sudo
-
-# Create ubuntu user with sudo privileges
-RUN useradd -ms /bin/bash ubuntu && \
-    usermod -aG sudo ubuntu
-# New added for disable sudo password
-RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-# Set as default user
-USER ubuntu
-WORKDIR /home/ubuntu
-
-# Configure tzdata
-RUN echo 'tzdata tzdata/Areas select Europe' | sudo debconf-set-selections
-RUN echo 'tzdata tzdata/Zones/Europe select London' | sudo debconf-set-selections
-RUN sudo apt-get install -qqy --no-install-recommends tzdata
-
-# Install hyperfine
-RUN sudo apt install -y wget
-RUN wget https://github.com/sharkdp/hyperfine/releases/download/v1.15.0/hyperfine_1.15.0_amd64.deb
-RUN sudo dpkg -i hyperfine_1.15.0_amd64.deb
+FROM effecthandlers/effect-handlers:base
 
 # Install libmprompt/libmpeff
 RUN sudo apt install -y wget git curl gcc make cmake

diff --git a/systems/links/Dockerfile b/systems/links/Dockerfile
@@ -1,33 +1,4 @@
-FROM ubuntu:22.04
-
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
-
-# Get the basic stuff
-RUN apt-get update && \
-    apt-get -y upgrade && \
-    apt-get install -y \
-    sudo
-
-# Create ubuntu user with sudo privileges
-RUN useradd -ms /bin/bash ubuntu && \
-    usermod -aG sudo ubuntu
-# New added for disable sudo password
-RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-# Set as default user
-USER ubuntu
-WORKDIR /home/ubuntu
-
-# Install hyperfine
-RUN sudo apt install -y wget
-RUN wget https://github.com/sharkdp/hyperfine/releases/download/v1.15.0/hyperfine_1.15.0_amd64.deb
-RUN sudo dpkg -i hyperfine_1.15.0_amd64.deb
-
-# Configure tzdata
-RUN echo 'tzdata tzdata/Areas select Europe' | sudo debconf-set-selections
-RUN echo 'tzdata tzdata/Zones/Europe select London' | sudo debconf-set-selections
-RUN sudo apt-get install -qqy --no-install-recommends tzdata
+FROM effecthandlers/effect-handlers:base
 
 # Install OCaml
 RUN sudo apt install -y wget git curl gcc make m4 unzip bubblewrap bzip2 pkg-config libgmp-dev

diff --git a/systems/ocaml/Dockerfile b/systems/ocaml/Dockerfile
@@ -1,28 +1,4 @@
-FROM ubuntu:22.04
-
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
-
-# Get the basic stuff
-RUN apt-get update && \
-    apt-get -y upgrade && \
-    apt-get install -y \
-    sudo
-
-# Create ubuntu user with sudo privileges
-RUN useradd -ms /bin/bash ubuntu && \
-    usermod -aG sudo ubuntu
-# New added for disable sudo password
-RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-# Set as default user
-USER ubuntu
-WORKDIR /home/ubuntu
-
-# Install hyperfine
-RUN sudo apt install -y wget
-RUN wget https://github.com/sharkdp/hyperfine/releases/download/v1.15.0/hyperfine_1.15.0_amd64.deb
-RUN sudo dpkg -i hyperfine_1.15.0_amd64.deb
+FROM effecthandlers/effect-handlers:base
 
 # Install Multicore OCaml
 RUN sudo apt install -y wget git curl gcc make m4 unzip bubblewrap bzip2