Temporary PR to integrate PDL's mass of bug fixes and enhancements

.gitignore

@@ -9,6 +9,9 @@ vmms/id_rsa*
 courselabs/*
 # config
 config.py
+output_gen
+.gitignore
+
 
 # Virtualenv
 .Python

Dockerfile

@@ -1,34 +1,27 @@
 # Start with empty ubuntu machine
-FROM ubuntu:15.04
+FROM ubuntu
 
 MAINTAINER Autolab Development Team "autolab-dev@andrew.cmu.edu"
 
 # Setup correct environment variable
 ENV HOME /root
 
-# Change to working directory
-WORKDIR /opt
-
-# Move all code into Tango directory
-ADD . TangoService/Tango/
-WORKDIR /opt/TangoService/Tango
-RUN mkdir volumes
-
-WORKDIR /opt
+RUN mkdir -p /opt/TangoFiles/volumes /opt/TangoFiles/courselabs /opt/TangoFiles/output
 
 # Install dependancies
 RUN apt-get update && apt-get install -y \
 	nginx \
 	curl \
 	git \
+    iputils-ping \
     vim \
     supervisor \
     python-pip \
     python-dev \
     build-essential \
     tcl8.5 \
     wget \
-    libgcrypt11-dev \ 
+    libgcrypt11-dev \
     zlib1g-dev \
 	apt-transport-https \
     ca-certificates \
@@ -38,13 +31,10 @@ RUN apt-get update && apt-get install -y \
  && rm -rf /var/lib/apt/lists/*
 
 # Install Redis
+WORKDIR /opt
 RUN wget http://download.redis.io/releases/redis-stable.tar.gz && tar xzf redis-stable.tar.gz
 WORKDIR /opt/redis-stable
-RUN make && make install 
-WORKDIR /opt/TangoService/Tango/
-
-# Install Docker from Docker Inc. repositories.
-RUN curl -sSL https://get.docker.com/ | sh
+RUN make && make install
 
 # Install the magic wrapper.
 ADD ./wrapdocker /usr/local/bin/wrapdocker
@@ -53,23 +43,29 @@ RUN chmod +x /usr/local/bin/wrapdocker
 # Define additional metadata for our image.
 VOLUME /var/lib/docker
 
-# Create virtualenv to link dependancies 
+# Install python dependancies
+ADD ./requirements.txt /opt/TangoFiles/requirements.txt
+WORKDIR /opt/TangoFiles
 RUN pip install virtualenv && virtualenv .
-# Install python dependancies 
 RUN pip install -r requirements.txt
+RUN pip install pytz
 
 RUN mkdir -p /var/log/docker /var/log/supervisor
 
 # Move custom config file to proper location
-RUN cp /opt/TangoService/Tango/deployment/config/nginx.conf /etc/nginx/nginx.conf
-RUN cp /opt/TangoService/Tango/deployment/config/supervisord.conf /etc/supervisor/supervisord.conf
-RUN cp /opt/TangoService/Tango/deployment/config/redis.conf /etc/redis.conf
+ADD ./deployment/config/nginx.conf /etc/nginx/nginx.conf
+ADD ./deployment/config/supervisord.conf /etc/supervisor/supervisord.conf
+ADD ./deployment/config/redis.conf /etc/redis.conf
+
+#JMB added for EC2 config
+ADD ./deployment/config/boto.cfg /etc/boto.cfg
+ADD ./deployment/config/746-autograde.pem /root/746-autograde.pem
+RUN chmod 600 /root/746-autograde.pem
 
 # Reload new config scripts
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 
-
-# TODO: 
+# TODO:
 # volumes dir in root dir, supervisor only starts after calling start once , nginx also needs to be started
 # Different log numbers for two different tangos
 # what from nginx forwards requests to tango

autodriver/Makefile

@@ -1,5 +1,6 @@
 CC = gcc
 CFLAGS = -W -Wall -Wextra
+LDFLAGS =  -pthread
 
 OBJS = autodriver.o
 

autodriver/README

@@ -0,0 +1,25 @@
+To build a grading vm image for Autolab jobs:
+
+Create a vm with a stock linux image
+Copy autodriver.c and Makefile to the vm and compile it to autodriver
+Copy autodriver to any common path, make it owned by root wtih setuid bits.
+For example: -rwsr-sr-x 1 root root /usr/bin/autodriver
+
+Create the following users
+autolab: The ssh/scp user tied with selected key pair of you cloud account
+autograde: The user to run TA's grader starting from the top Makefile (see autodriver.c)
+student: For student to use the exact image for coding/testing
+
+The sequence of grading using the above image is such:
+
+The grading engine: scp top level Makefile, autograde.tar (both made by course staff)
+and student's submission to the grading vm.
+
+The grading engine: ssh to run autodriver program.
+
+The greating vm: autodriver program (running as root because of the setuid bit) starts
+a child process (running as user autograde) to run "make" with top level Makefile.
+
+The grading engine: scp the output file from the grading vm.
+
+