Update Dockerfile and add instructions

Co-authored-by: Dimitris Mouris <[email protected]>

Author: cgouert

Dockerfile

@@ -1,61 +1,29 @@
 FROM cimg/openjdk:11.0
 
+USER root
+
 # Install dependencies to build HE libraries
-RUN apt update
-RUN apt install cmake make build-essential g++ clang autoconf javacc patchelf m4 tar lzip libfftw3-dev
+RUN apt-get update
+RUN apt-get install cmake make build-essential g++ clang autoconf javacc patchelf m4 tar lzip libfftw3-dev
 RUN wget -c https://go.dev/dl/go1.17.6.linux-amd64.tar.gz
-RUN sudo tar -C /usr/local -xzf go1.17.6.linux-amd64.tar.gz
+RUN tar -C /usr/local -xzf go1.17.6.linux-amd64.tar.gz
 RUN export PATH=$PATH:/usr/local/go/bin
 
+# Copy files to docker container
+COPY . .
+
 # Resolve all maven project dependencies
 RUN mvn dependency:go-offline
 
 # Build T2 compiler and run tests
-RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" && mvn package
+RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
+RUN mvn package
 
 # Clone HE libraries
 RUN .circleci/clone_libs.sh
 
 # Build HE libraries
 RUN .circleci/build_libs.sh
 
-# Install HElib v2.2.2
-# RUN cd HElib
-WORKDIR HElib
-RUN make install
-RUN ln -sf /usr/local/lib/libntl.so.44 /usr/lib/libntl.so.44
-
-# Install PALISADE v1.11.9
-WORKDIR palisade-release/build
-RUN make install
-RUN ln -sf /usr/local/lib/libPALISADEcore.so.1 /usr/lib/libPALISADEcore.so.1
-
-# Install SEAL 4.1.1
-WORKDIR SEAL
-RUN cmake --install build
-
-# Install TFHE 1.0.1
-WORKDIR tfhe
-RUN make install
-RUN ln -sf /usr/local/lib/libtfhe-nayuki-avx.so /usr/lib/libtfhe-nayuki-avx.so
-RUN ln -sf /usr/local/lib/libtfhe-nayuki-portable.so /usr/lib/libtfhe-nayuki-portable.so
-RUN ln -sf /usr/local/lib/libtfhe-spqlios-avx.so /usr/lib/libtfhe-spqlios-avx.so
-RUN ln -sf /usr/local/lib/libtfhe-spqlios-fma.so /usr/lib/libtfhe-spqlios-fma.so
-
 # Run T2 tests
 RUN mvn test
-
-# # Run HElib tests
-# RUN .circleci/test_HElib.sh
-
-# # Run Lattigo tests
-# RUN .circleci/test_Lattigo.sh
-
-# # Run SEAL tests
-# RUN .circleci/test_SEAL.sh
-
-# # Run TFHE tests
-# RUN .circleci/test_TFHE.sh
-
-# # Run PALISADE tests
-# RUN .circleci/test_PALISADE.sh

README.md

@@ -90,7 +90,19 @@ You can cite these articles as follows:
 
 
 ## Build and Run Instructions
-### Dependencies
+
+### Building with Docker
+* Build the Docker image:
+  ```powershell
+  docker build -t t2 .
+  ```
+* Run the Docker container: 
+  ```powershell
+  docker run --rm -i -t t2 bash
+  ```
+
+### Building from Scratch
+#### Dependencies
 *
   ```powershell
   apt install cmake make build-essential g++ clang autoconf javacc patchelf openjdk-8-jdk maven m4 tar lzip libfftw3-dev
@@ -99,7 +111,7 @@ You can cite these articles as follows:
 * Follow and modify [clone_libs.sh](./.circleci/clone_libs.sh) and
   [build_libs.sh](./.circleci/build_libs.sh) scripts to install the FHE libraries in your custom destinations.
 
-### Compile the T2 compiler
+#### Compile the T2 compiler
 ```powershell
 mvn initialize package
 ```
@@ -109,7 +121,7 @@ To skip running the test when compiling the T2 compiler run:
 mvn package -Dmaven.test.skip
 ```
 
-### Compile T2 programs
+## Compile T2 programs
 To compile a T2 program type:
 ```powershell
 java -jar target/terminator-compiler-1.0.jar <path_to_t2_file> [--debug] <LIB> [--w word_size]