Skip to content

Commit

Permalink
Update Dockerfiles
Browse files Browse the repository at this point in the history
master now has 2 dockerfiles, one targeting 122 with C0, and one not
Apply updates (fewer RUN lines, do not fetch autodriver from github) to
both of them.
  • Loading branch information
cg2v committed Aug 3, 2015
1 parent 4d730de commit b584c79
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 83 deletions.
32 changes: 32 additions & 0 deletions autodriver/Dockerfile_122
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Autolab - autograding docker image

FROM ubuntu:14.04
MAINTAINER Mihir Pandya <[email protected]>

RUN apt-get update && apt-get install -y build-essential wget python

# Install autodriver
WORKDIR /home
RUN useradd autolab && useradd autograde
RUN mkdir autolab autograde output && chown autolab:autolab autolab output && chown autograde:autograde autograde
ADD . /home/autodriver
WORKDIR /home/autodriver
RUN make clean && make && install -c -o root -g root -m 4755 autodriver /usr/bin/autodriver && install -c -m 755 autograde_wrapper.py /usr/bin/autograde_wrapper && cp cc0wrap.sh /usr/bin/cc0 && chmod +x /usr/bin/cc0

ENTRYPOINT ["/usr/bin/autograde_wrapper"]

# Install C0
WORKDIR /home
RUN wget http://c0.typesafety.net/dist/cc0-v0440-linux3.18.1-64bit-bin.tgz
RUN tar -C /usr/local -xvzf cc0-*
WORKDIR /usr/local/cc0
RUN bin/cc0 -d doc/src/exp.c0 doc/src/exp-test.c0
#RUN ./a.out

# Clean up
WORKDIR /home
RUN apt-get remove -y wget && apt-get -y autoremove
RUN rm -rf autodriver cc0*

# Check installation
RUN ls -l /home && which autodriver && which cc0
24 changes: 24 additions & 0 deletions autodriver/Dockerfile_ubuntu
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Autolab - autograding docker image

FROM ubuntu:14.04
MAINTAINER Mihir Pandya <[email protected]>

RUN apt-get update && apt-get install -y build-essential wget python

# Install autodriver
WORKDIR /home
RUN useradd autolab && useradd autograde
RUN mkdir autolab autograde output && chown autolab:autolab autolab output && chown autograde:autograde autograde
ADD . /home/autodriver
WORKDIR /home/autodriver
RUN make clean && make && install -c -o root -g root -m 4755 autodriver /usr/bin/autodriver && install -c -m 755 autograde_wrapper.py /usr/bin/autograde_wrapper

ENTRYPOINT ["/usr/bin/autograde_wrapper"]

# Clean up
WORKDIR /home
RUN apt-get remove -y wget && apt-get -y autoremove
RUN rm -rf autodriver

# Check installation
RUN ls -l /home && which autodriver
49 changes: 0 additions & 49 deletions vmms/Dockerfile_122

This file was deleted.

34 changes: 0 additions & 34 deletions vmms/Dockerfile_ubuntu

This file was deleted.

0 comments on commit b584c79

Please sign in to comment.