From 8bb596bef3b78a96dcf5b47d7267654057d76493 Mon Sep 17 00:00:00 2001
From: Benedikt Radtke
Date: Tue, 29 Sep 2020 19:33:32 +0200
Subject: Add Dockerfile that builds sail from source

---
 .dockerignore      |  4 ++++
 Dockerfile         | 22 ----------------------
 Dockerfile.nightly | 16 ++++++++++++++++
 Dockerfile.release | 22 ++++++++++++++++++++++
 4 files changed, 42 insertions(+), 22 deletions(-)
 delete mode 100644 Dockerfile
 create mode 100644 Dockerfile.nightly
 create mode 100644 Dockerfile.release

diff --git a/.dockerignore b/.dockerignore
index f3b64113..a06dd1db 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,5 @@
 **/.git
+*.md
+.gitignore
+.dockerignore
+Dockerfile
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 4db0ce5f..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM ubuntu
-RUN apt-get update
-RUN apt-get upgrade -y
-RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y opam build-essential libgmp-dev z3 pkg-config zlib1g-dev
-RUN mkdir /etc/sudoers.d/ && \
-  echo 'opam ALL=(ALL:ALL) NOPASSWD:ALL' > /etc/sudoers.d/opam && \
-  chmod 440 /etc/sudoers.d/opam && \
-  chown root:root /etc/sudoers.d/opam && \
-  adduser --disabled-password --gecos '' opam && \
-  passwd -l opam && \
-  chown -R opam:opam /home/opam
-USER opam
-ENV HOME /home/opam
-WORKDIR /home/opam
-RUN opam init --disable-sandboxing
-RUN eval `opam env` && \
-  opam repository add rems https://github.com/rems-project/opam-repository.git && \
-  opam install -y sail
-COPY --chown=opam docker_entry_point.sh /home/opam/
-RUN chmod +x docker_entry_point.sh
-WORKDIR /data
-ENTRYPOINT ["/home/opam/docker_entry_point.sh"]
diff --git a/Dockerfile.nightly b/Dockerfile.nightly
new file mode 100644
index 00000000..7dee7934
--- /dev/null
+++ b/Dockerfile.nightly
@@ -0,0 +1,16 @@
+FROM ubuntu
+
+# Install apt deps
+RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates build-essential libgmp-dev z3 libz3-dev opam rsync pkg-config m4 zlib1g-dev
+
+# Configure opam
+RUN opam init -y --no-setup --compiler=4.10.0 --shell=sh --disable-sandboxing
+
+# Copy code
+WORKDIR /sail-src
+COPY . /sail-src
+
+# build
+RUN opam pin -y add sail $PWD
+
+ENTRYPOINT [ "/sail-src/docker_entry_point.sh" ]
diff --git a/Dockerfile.release b/Dockerfile.release
new file mode 100644
index 00000000..4db0ce5f
--- /dev/null
+++ b/Dockerfile.release
@@ -0,0 +1,22 @@
+FROM ubuntu
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y opam build-essential libgmp-dev z3 pkg-config zlib1g-dev
+RUN mkdir /etc/sudoers.d/ && \
+  echo 'opam ALL=(ALL:ALL) NOPASSWD:ALL' > /etc/sudoers.d/opam && \
+  chmod 440 /etc/sudoers.d/opam && \
+  chown root:root /etc/sudoers.d/opam && \
+  adduser --disabled-password --gecos '' opam && \
+  passwd -l opam && \
+  chown -R opam:opam /home/opam
+USER opam
+ENV HOME /home/opam
+WORKDIR /home/opam
+RUN opam init --disable-sandboxing
+RUN eval `opam env` && \
+  opam repository add rems https://github.com/rems-project/opam-repository.git && \
+  opam install -y sail
+COPY --chown=opam docker_entry_point.sh /home/opam/
+RUN chmod +x docker_entry_point.sh
+WORKDIR /data
+ENTRYPOINT ["/home/opam/docker_entry_point.sh"]
-- 
cgit v1.2.3