Merge pull request #71 from occam-ra/dockerfile-libboost-and-repair

Dockerfile changes: add libboost and general fixes, add run.sh, move GitHub creds prompt to command-line option

Author: bowertree

podman/Dockerfile

@@ -7,49 +7,43 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV DEBCONF_NONINTERACTIVE_SEEN true
 RUN ln -sf /usr/share/zoneinfo/US/Pacific /etc/localtime
 
-# Set up build arguments
-ARG GITHUB_USERNAME
-ARG GITHUB_EMAIL
-ARG GITHUB_PRIVATE_KEY
-
 RUN apt-get update
 RUN apt install -y tzdata
 RUN dpkg-reconfigure -f noninteractive tzdata
 # We can run apache2 inside the container and start it as a service
 RUN apt install -y apache2
 # Maybe this can be trimmed. It was the standard suggested package list.
 RUN apt install -y git gcc build-essential libgmp3-dev python-dev libxml2 libxml2-dev zlib1g-dev python-pip
-
 RUN apt install -y libtool autoconf bison flex
-RUN apt-get update && \
-    apt-get install -y git vim openssh-client && \
-    rm -rf /var/lib/apt/lists/*
-
+RUN apt install -y git vim openssh-client
+RUN apt install -y libboost-math-dev
 # Set up build arguments with default values
-ARG GITHUB_USERNAME=""
-ARG GITHUB_EMAIL=""
-ARG GITHUB_PRIVATE_KEY=""
+ARG GITHUB_USERNAME
+ARG GITHUB_EMAIL
+ARG GITHUB_PRIVATE_KEY
+
+WORKDIR /var/www
 
 # Maybe checkout something better than HEAD?
 RUN git clone https://github.com/occam-ra/occam.git
 
+WORKDIR occam
+
 # Configure git with the build arguments if provided
 RUN if [ -n "$GITHUB_USERNAME" ] && [ -n "$GITHUB_EMAIL" ]; then \
       git config --global user.name "$GITHUB_USERNAME" && \
-      git config --global user.email "$GITHUB_EMAIL"; \
-      git remote set-url origin [email protected]:occam-ra/occam.git;\
+      git config --global user.email "$GITHUB_EMAIL" && \
+      git remote set-url origin [email protected]:occam-ra/occam.git; \
     fi
 
 # Create the .ssh directory and copy the private key if provided
 RUN if [ -n "$GITHUB_PRIVATE_KEY" ]; then \
       mkdir -p /root/.ssh && \
-      echo "$GITHUB_PRIVATE_KEY" > /root/.ssh/id_rsa && \
-      chmod 600 /root/.ssh/id_rsa && \
-      echo "Host github.com\n  IdentityFile /root/.ssh/id_rsa" > /root/.ssh/config; \
+      echo "$GITHUB_PRIVATE_KEY" > /root/.ssh/id_github && \
+      chmod 600 /root/.ssh/id_github && \
+      echo "Host github.com\n  IdentityFile /root/.ssh/id_github" > /root/.ssh/config; \
     fi
 
-
-WORKDIR occam
 # Install igraph
 RUN pip install python-igraph==0.8.0
 

podman/build.sh

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-# Prompt the user if they want to enter GitHub details
-read -p "Do you want to enter your GitHub details? (y/n): " ENTER_GITHUB
-
-if [[ $ENTER_GITHUB =~ ^[Yy]$ ]]; then
+if [[ "$1" == "--github" ]]; then
   # Prompt the user for input
   read -p "Enter your GitHub username: " GITHUB_USERNAME
   read -p "Enter your GitHub email: " GITHUB_EMAIL

podman/run.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+podman run -d -p 8080:80 occam_local
+echo "You can now connect at http://localhost:8080/"